X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=parse.icl;fp=parse.icl;h=36791241438c6a3c37c0de62d7520ddb34cc6d8c;hb=5d40ca411bed8014f9bf081436208d831ac5c972;hp=9aabea3cabccde5a3e722f7724c5473971fec6bb;hpb=84eef96578e71866127e804bc265359c874aac68;p=cc1516.git diff --git a/parse.icl b/parse.icl index 9aabea3..3679124 100644 --- a/parse.icl +++ b/parse.icl @@ -68,7 +68,6 @@ parseStmt = parseIfStmt <|> parseWhileStmt <|> parseBlock = parseBCBraces (many parseStmt) parseOneLine :: Parser Token [Stmt] - //first pure makes singleton list from the statement parseOneLine = pure <$> parseStmt parseFunType :: Parser Token FunType @@ -122,8 +121,8 @@ parseExpr = //Operators in order of binding strength parseOpL :: (Parser Token Op2) (Parser Token Expr) -> Parser Token Expr parseOpL ops prev = peekPos >>= \pos-> prev >>= \e1->many ( - ops >>= \op->prev >>= \e->pure (op, e) - ) >>= \moe->foldM (\e->(\(op,e2)->pure $ Op2Expr pos e op e2)) e1 moe + ops >>= \op->prev >>= \e->pure (op, e)) + >>= \moe->foldM (\e->(\(op,e2)->pure $ Op2Expr pos e op e2)) e1 moe parseBasicExpr :: Parser Token Expr parseBasicExpr = peekPos >>= \pos -> @@ -139,7 +138,8 @@ parseExpr = //Operators in order of binding strength (VarExpr pos <$> parseVarDef) parseFunCall :: Parser Token FunCall -parseFunCall = FunCall <$> parseIdent <*> (parseBBraces $ parseSepList CommaToken parseExpr) +parseFunCall = FunCall <$> parseIdent <*> + (parseBBraces $ parseSepList CommaToken parseExpr) parseVarDef :: Parser Token VarDef parseVarDef = liftM2 VarDef