on master help sign in
less backtracking and better errors for `freshLine`
c376ed6Evan Czaplicki
src/Parse/Helpers.hs+14−4
@@ -353,11 +353,21 @@ whitespace =
353 option "" forcedWS
353 option "" forcedWS
354
354
355
355
356−freshLine :: IParser [[String]]
356+freshLine :: IParser String
357freshLine =
357freshLine =
358+ try (
359+ do ws <- many1 (spaces <|> newline)
360+ column <- sourceColumn <$> getPosition
361+ if column == 1
362+ then return (concat ws)
363+ else fail badFreshLineMessage
358− try (many1 newline >> many space_nl) <|> try (many1 space_nl) <?> Syntax.freshLine
364+ ) <?> Syntax.freshLine
359− where
365+
360− space_nl = try $ spaces >> many1 newline
366+
367+badFreshLineMessage :: String
368+badFreshLineMessage =
369+ "I need a fresh line to start a new declaration. This means a new line that\n"
370+ ++ "starts with stuff, not with spaces or comments."
361
371
362
372
363newline :: IParser String
373newline :: IParser String