c8fe5c5 · elk · git.iko.soy

git.iko.soy/elk

on master help sign in

Merge pull request #1101 from elm-lang/whitespace-fixes

c8fe5c5Evan Czaplicki11 years ago

src/Parse/Helpers.hs+27−11

compare with master

unifiedsplit

@@ -327,13 +327,19 @@ spaces =

327

328forcedWS :: IParser String

329forcedWS =

330− choice

330+ do ws <- many1 (spaces <|> newline)

331− [ (++) <$> spaces <*> (concat <$> many nl_space)

331+ column <- sourceColumn <$> getPosition

332− , concat <$> many1 nl_space

332+ if column == 1

333− ]

333+ then fail badWhiteSpaceMessage

334− where

334+ else return (concat ws)

335− nl_space =

335+

336− try ((++) <$> (concat <$> many1 newline) <*> spaces)

336+

337+badWhiteSpaceMessage :: String

338+badWhiteSpaceMessage =

339+ "I need whitespace, but got stuck on what looks like a new declaration.\n"

340+ ++ "\n"

341+ ++ "You are either missing some stuff in the declaration above or just need to add\n"

342+ ++ "some spaces here:"

337

343

338

344

339-- Just eats whitespace until the next meaningful character.

345-- Just eats whitespace until the next meaningful character.

@@ -347,11 +353,21 @@ whitespace =

347 option "" forcedWS

353 option "" forcedWS

348

354

349

355

350−freshLine :: IParser [[String]]

356+freshLine :: IParser String

351freshLine =

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

352− try (many1 newline >> many space_nl) <|> try (many1 space_nl) <?> Syntax.freshLine

364+ ) <?> Syntax.freshLine

353− where

365+

354− 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."

355

371

356

372

357newline :: IParser String

373newline :: IParser String

src/Parse/Parse.hs+2−3

@@ -3,7 +3,7 @@ module Parse.Parse (program, parse) where

4import qualified Data.Map as Map

5import qualified Data.Traversable as T

6−import Text.Parsec (char, eof, letter, many, optional, putState, (<|>))

6+import Text.Parsec (char, eof, letter, many, putState, (<|>))

7import qualified Text.Parsec.Error as Parsec

9import qualified AST.Declaration as D

@@ -47,8 +47,7 @@ programParser :: Package.Name -> IParser M.SourceModule

47programParser pkgName =

48 do (M.Header name docs exports imports) <- Module.header

49 decls <- declarations

50− optional freshLine

50+ _ <- many (spaces <|> newline)

51− optional spaces

52 eof

51 eof

54 let canonicalName =

53 let canonicalName =