git.iko.soy/elk
on master help sign in
shuffle things around a bit in Make.hs
ffff9c4Evan Czaplicki
terminal/src/Make.hs+2−13
compare with master
unifiedsplit
@@ -65,14 +65,13 @@ run :: [FilePath] -> Flags -> IO ()
65run paths (Flags debug optimize maybeOutput report maybeDocs) =
65run paths (Flags debug optimize maybeOutput report maybeDocs) =
66 do style <- getStyle report
66 do style <- getStyle report
67 Reporting.attemptWithStyle style Exit.makeToReport $ Task.run $
67 Reporting.attemptWithStyle style Exit.makeToReport $ Task.run $
68− do root <- getRoot
68+ do root <- Task.mio Exit.MakeNoOutline Stuff.findRoot
69 desiredMode <- getMode debug optimize
69 desiredMode <- getMode debug optimize
70− details <- getDetails style root
70+ details <- Task.eio Exit.MakeBadDetails (Details.load style root)
71 case paths of
71 case paths of
72 [] ->
72 [] ->
73 do exposed <- getExposed details
73 do exposed <- getExposed details
74 buildExposed style root details maybeDocs exposed
74 buildExposed style root details maybeDocs exposed
75− return ()
76
75
77 p:ps ->
76 p:ps ->
78 do artifacts <- buildPaths style root details (NE.List p ps)
77 do artifacts <- buildPaths style root details (NE.List p ps)
@@ -123,11 +122,6 @@ getStyle report =
123 Just Json -> return Reporting.json
122 Just Json -> return Reporting.json
124
123
125
124
126−getRoot :: Task FilePath
127−getRoot =
128− Task.mio Exit.MakeNoOutline Stuff.findRoot
129−
130−
131getMode :: Bool -> Bool -> Task DesiredMode
125getMode :: Bool -> Bool -> Task DesiredMode
132getMode debug optimize =
126getMode debug optimize =
133 case (debug, optimize) of
127 case (debug, optimize) of
@@ -137,11 +131,6 @@ getMode debug optimize =
137 (False, True ) -> return Prod
131 (False, True ) -> return Prod
138
132
139
133
140−getDetails :: Reporting.Style -> FilePath -> Task Details.Details
141−getDetails style root =
142− Task.eio Exit.MakeBlockedByDetailsProblem (Details.load style root)
143−
144−
145getExposed :: Details.Details -> Task (NE.List ModuleName.Raw)
134getExposed :: Details.Details -> Task (NE.List ModuleName.Raw)
146getExposed (Details.Details _ validOutline _ _ _) =
135getExposed (Details.Details _ validOutline _ _ _) =
147 case validOutline of
136 case validOutline of