Enable parser error handler displays tokens instead of line numbers

This commit is contained in:
2021-11-04 11:45:54 +01:00
parent a10e857ffe
commit e28410ceeb

View File

@@ -288,8 +288,8 @@ parse :: [Token] -> Either String AST
parse tokens = do
let lines = U.explode (==NewLine) tokens
let results = map (assertConsumed parseLine) lines
let errors = filter ((==Nothing) . snd) (zipWith (,) [1..] $ results)
let errorMsg = "Parse error in line(s): " ++ (List.intercalate ", " $ map (show. fst) errors)
let errors = filter ((==Nothing) . snd) $ zipWith (,) lines $ results
let errorMsg = "Parse error(s):\n" ++ (List.intercalate "\n" $ map (show . fst) errors)
case sequenceA results of
(Just r) -> return $ ProgramNode $ map (\(ParseResult ast _) -> ast) r
Nothing -> Left errorMsg