X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=parse.dcl;h=f2713f7513038dd5dd3878142120b8b987e06790;hb=c5fb28639ae923d9b55f5832e45186911e610991;hp=785dfbcc17603b92652cdc375a88d4e2c804b91f;hpb=4766205e7035a58c8a1fa1557b6e14577ed26f32;p=cc1516.git

diff --git a/parse.dcl b/parse.dcl
index 785dfbc..f2713f7 100644
--- 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