e2775f7 · elk · git.iko.soy

on master help sign in

Add custom error message if tab character is found in parsing.

e2775f7Laszlo Pandy11 years ago

src/Parse/Helpers.hs+16−1

@@ -327,7 +327,9 @@ spaces =

327

328forcedWS :: IParser String

329forcedWS =

330+ do failIfTabFound

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

331+ ws <- many1 (spaces <|> newline)

332+ failIfTabFound

331 column <- sourceColumn <$> getPosition

333 column <- sourceColumn <$> getPosition

332 if column == 1

334 if column == 1

333 then fail badWhiteSpaceMessage

335 then fail badWhiteSpaceMessage

@@ -342,6 +344,19 @@ badWhiteSpaceMessage =

342 ++ "some spaces here:"

344 ++ "some spaces here:"

343

345

344

346

347+failIfTabFound :: IParser ()

348+failIfTabFound =

349+ do foundTab <- option False (lookAhead (char '\t') >> return True)

350+ if foundTab

351+ then fail tabsErrorMessage

352+ else return ()

353+

354+

355+tabsErrorMessage :: String

356+tabsErrorMessage =

357+ "A tab character was found, but all whitespace (including indentation) must be spaces not tabs."

358+

359+

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

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

346dumbWhitespace :: IParser String

361dumbWhitespace :: IParser String

347dumbWhitespace =

362dumbWhitespace =