git.iko.soy/elk
on master help sign in
cosmetic: get rid of type alias that makes things harder to read later
8a14611Evan Czaplicki
compiler/src/Elm/Docs.hs+6−9
compare with master
unifiedsplit
@@ -316,10 +316,7 @@ emptyModule (ModuleName.Canonical _ name) overview =
316-- PARSE OVERVIEW
316-- PARSE OVERVIEW
317
317
318
318
319−type LName = A.Located N.Name
320−
321−
322−parseOverview :: R.Region -> B.ByteString -> Result.Result i w Error.Error [LName]
319+parseOverview :: R.Region -> B.ByteString -> Result.Result i w Error.Error [A.Located N.Name]
323parseOverview (R.Region (R.Position row col) _) overview =
320parseOverview (R.Region (R.Position row col) _) overview =
324 case P.runAt row (col + 3) (chompOverview []) overview of
321 case P.runAt row (col + 3) (chompOverview []) overview of
325 Left err ->
322 Left err ->
@@ -329,7 +326,7 @@ parseOverview (R.Region (R.Position row col) _) overview =
329 Result.ok names
326 Result.ok names
330
327
331
328
332−chompOverview :: [LName] -> Parser [LName]
329+chompOverview :: [A.Located N.Name] -> Parser [A.Located N.Name]
333chompOverview names =
330chompOverview names =
334 do isDocs <- W.chompUntilDocs
331 do isDocs <- W.chompUntilDocs
335 if isDocs
332 if isDocs
@@ -337,7 +334,7 @@ chompOverview names =
337 else return names
334 else return names
338
335
339
336
340−chompOverviewHelp :: [LName] -> Parser [LName]
337+chompOverviewHelp :: [A.Located N.Name] -> Parser [A.Located N.Name]
341chompOverviewHelp names =
338chompOverviewHelp names =
342 do pos <- P.getPosition
339 do pos <- P.getPosition
343 (W.SPos spos) <- W.whitespace
340 (W.SPos spos) <- W.whitespace
@@ -346,7 +343,7 @@ chompOverviewHelp names =
346 else chompOverview =<< chompDocs names
343 else chompOverview =<< chompDocs names
347
344
348
345
349−chompDocs :: [LName] -> Parser [LName]
346+chompDocs :: [A.Located N.Name] -> Parser [A.Located N.Name]
350chompDocs names =
347chompDocs names =
351 do name <- P.addLocation (P.oneOf [ Var.lower, Var.upper, chompBinop ])
348 do name <- P.addLocation (P.oneOf [ Var.lower, Var.upper, chompBinop ])
352 spos <- W.whitespace
349 spos <- W.whitespace
@@ -379,7 +376,7 @@ type Dups =
379 Map.Map N.Name (OneOrMore.OneOrMore R.Region)
376 Map.Map N.Name (OneOrMore.OneOrMore R.Region)
380
377
381
378
382−checkNames :: Map.Map N.Name (A.Located Can.Export) -> [LName] -> Result i w ()
379+checkNames :: Map.Map N.Name (A.Located Can.Export) -> [A.Located N.Name] -> Result i w ()
383checkNames exports names =
380checkNames exports names =
384 do docs <- Map.traverseWithKey isUnique (List.foldl' addName Map.empty names)
381 do docs <- Map.traverseWithKey isUnique (List.foldl' addName Map.empty names)
385 let overlap = Map.size (Map.intersection docs exports)
382 let overlap = Map.size (Map.intersection docs exports)
@@ -391,7 +388,7 @@ checkNames exports names =
391 Result.ok ()
388 Result.ok ()
392
389
393
390
394−addName :: Dups -> LName -> Dups
391+addName :: Dups -> A.Located N.Name -> Dups
395addName dict (A.At region name) =
392addName dict (A.At region name) =
396 Map.insertWith OneOrMore.more name (OneOrMore.one region) dict
393 Map.insertWith OneOrMore.more name (OneOrMore.one region) dict
397
394