repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mastert push ' of github.com:dopefishh/cc1516
[cc1516.git]
/
parse.dcl
diff --git
a/parse.dcl
b/parse.dcl
index
785dfbc
..
ad7edea
100644
(file)
--- a/
parse.dcl
+++ b/
parse.dcl
@@
-1,10
+1,12
@@
definition module parse
from Data.Either import :: Either
definition module parse
from Data.Either import :: Either
+from Data.Maybe import :: Maybe
+from StdString import class toString
-from lex import :: LexerOutput, :: Token, :: TokenValue
+from lex import :: LexerOutput, :: Error, :: Token, :: TokenValue, :: Pos
+from AST import :: AST
-:: ParserOutput :== Either String AST
-:: AST = If | While //stub
+:: ParserOutput :== Either Error AST
-parse
:: LexerOutput
-> ParserOutput
+parse
r :: [Token]
-> ParserOutput