Merge branch 'master' of https://github.com/dopefishh/cc1516

[cc1516.git] / parse.dcl

diff --git a/parse.dcl b/parse.dcl
index c5d2724..f2713f7 100644 (file)
--- a/parse.dcl
+++ b/parse.dcl
@@ -4,9 +4,10 @@ from Data.Either import :: Either
 from Data.Maybe import :: Maybe
 from StdString import class toString
 
-import lex
-from AST import :: AST
+from lex import :: LexerOutput, :: Error, :: Token, :: TokenValue, :: Pos
+from AST import :: AST, :: Expr
 
 :: ParserOutput :== Either Error AST
 
-parser :: LexerOutput -> ParserOutput
+parser :: [Token] -> ParserOutput
+makeStrExpr :: Pos [Char] -> Expr