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

Wrap all parsers and enable parsing problem

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-11-04 10:05:29 +01:00
parent cf66dbc928
commit 759f0b5c00
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Assembler.hs
View File

@@ -131,6 +131,7 @@ tokenize input = tokens >>= (\t -> Right $ filter tokenFilter t)
tokenFilter :: Token -> Bool tokenFilter :: Token -> Bool
tokenFilter (WhiteSpace) = False tokenFilter (WhiteSpace) = False
tokenFilter (Comment _) = False tokenFilter (Comment _) = False
tokenFilter (NewLine) = False
tokenFilter _ = True tokenFilter _ = True
tokenizers :: Tokenizer tokenizers :: Tokenizer
@@ -159,7 +160,7 @@ data AST = EmptyNode
| ParamNode AST | ParamNode AST
| ParamsNode [AST] | ParamsNode [AST]
| InstructionNode AST AST | InstructionNode AST AST
| LineNode AST AST | LineNode AST AST
deriving (Eq, Show) deriving (Eq, Show)
type ConsumedTokens = Int type ConsumedTokens = Int
@@ -258,11 +259,6 @@ parseAll (p:ps) tokens = do
parse :: [Token] -> Either String [AST] parse :: [Token] -> Either String [AST]
parse [] = Right [] parse [] = Right []
parse tokens = case parsers tokens of parse tokens = case parseLine tokens of
(Just (ParseResult ast consumed)) -> parse (drop consumed tokens) >>= (\rest -> return $ ast : rest) (Just (ParseResult ast consumed)) -> parse (drop consumed tokens) >>= (\rest -> return $ ast : rest)
Nothing -> Left $ "Unexpected token: " ++ (show . head) tokens Nothing -> Left $ "Unexpected token: " ++ (show . head) tokens
parsers :: Parser
parsers = parseAny
[ parseLine
]