X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=parse.icl;h=9aabea3cabccde5a3e722f7724c5473971fec6bb;hb=84eef96578e71866127e804bc265359c874aac68;hp=8c4a25e5bea6acf2927026f1b68603a611d47884;hpb=3ca56ec76529508b1e6a3c10c145b15312f571f7;p=cc1516.git

diff --git a/parse.icl b/parse.icl
index 8c4a25e..9aabea3 100644
--- a/parse.icl
+++ b/parse.icl
@@ -20,7 +20,10 @@ import AST
 
 parser :: LexerOutput -> ParserOutput
 parser (Left e) = Left e
-parser (Right r) = fst $ runParser parseProgram r
+parser (Right r) = case runParser parseProgram r of
+	(Right ast, [(p, t):xs]) = Left $ PositionalError p.line p.col (
+		"Unable to parse from: " +++ printToString t)
+	x = fst x
 
 parseProgram :: Parser Token AST
 parseProgram = AST <$> (many parseVarDecl) <*> (some parseFunDecl)
@@ -29,15 +32,15 @@ parseFunDecl :: Parser Token FunDecl
 parseFunDecl = liftM6 FunDecl
     (peekPos)
     (parseIdent)
-	(satTok BraceOpenToken *> parseSepList CommaToken parseIdent <* satTok BraceCloseToken)
-	(optional parseFunType <* satTok CBraceOpenToken)
-	(many parseVarDecl)
+	(parseBBraces $ parseSepList CommaToken parseIdent)
+	(optional parseFunType)
+	(satTok CBraceOpenToken *> many parseVarDecl)
 	(many parseStmt <* satTok CBraceCloseToken)
 
 parseStmt :: Parser Token Stmt
 parseStmt = parseIfStmt <|> parseWhileStmt <|>
 	parseSColon parseAssStmt <|> parseSColon parseReturnStmt <|>
-	(liftM FunStmt (parseSColon parseFunCall))
+	(FunStmt <$> parseSColon parseFunCall)
 	where
 		parseSColon :: (Parser Token a) -> Parser Token a
 		parseSColon p = p <* satTok SColonToken
@@ -58,8 +61,8 @@ parseStmt = parseIfStmt <|> parseWhileStmt <|>
                 (optional (satTok ElseToken *> (parseBlock<|> parseOneLine))))
 
 		parseWhileStmt :: Parser Token Stmt
-		parseWhileStmt = satTok WhileToken *>
-			(WhileStmt <$> (parseBBraces parseExpr) <*> parseBlock)
+		parseWhileStmt = satTok WhileToken *> (WhileStmt <$> 
+			(parseBBraces parseExpr) <*> (parseBlock <|> parseOneLine))
 
 		parseBlock :: Parser Token [Stmt]
 		parseBlock = parseBCBraces (many parseStmt)
@@ -197,4 +200,4 @@ parseIdent :: Parser Token String
 parseIdent = trans2 (IdentToken "") (\(IdentToken e).toString e)
 
 //liftM only goes to liftM5
-liftM6 f m1 m2 m3 m4 m5 m6 = f <$> m1 <*> m2 <*> m3 <*> m4 <*> m5 <*> m6
\ No newline at end of file
+liftM6 f m1 m2 m3 m4 m5 m6 = f <$> m1 <*> m2 <*> m3 <*> m4 <*> m5 <*> m6