curry gotcha

[cc1516.git] / parse.dcl

diff --git a/parse.dcl b/parse.dcl
index 785dfbc..f2713f7 100644 (file)
--- a/parse.dcl
+++ b/parse.dcl
@@ -1,10 +1,13 @@
 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, :: Expr
 
-:: ParserOutput :== Either String AST
-:: AST = If | While //stub
+:: ParserOutput :== Either Error AST
 
-parse :: LexerOutput -> ParserOutput
+parser :: [Token] -> ParserOutput
+makeStrExpr :: Pos [Char] -> Expr