bartek/mvm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable parser error handler displays tokens instead of line numbers

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-11-04 11:45:54 +01:00
parent a10e857ffe
commit e28410ceeb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Assembler.hs
View File

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