suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the parsing of associative operators

Browse Source
This commit is contained in:
Neil Brown 2009-04-07 15:43:41 +00:00
parent 7bd4e3d309
commit 095e3e1680
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontends/ParseOccam.hs
View File

@ -770,7 +770,9 @@ expression
<|> do { m <- md; sDEFINED; e <- expression; return $ A.IsDefined m e } <|> do { m <- md; sDEFINED; e <- expression; return $ A.IsDefined m e }
<|> sizeExpr <|> sizeExpr
<|> do m <- md <|> do m <- md
(l, o) <- tryVV operand $ udOperator ((`elem` [JustDyadic, EitherDyadicMonadic]) . operatorArity) (l, o) <- tryVV operand $ udOperator
(\op -> (operatorArity op `elem` [JustDyadic, EitherDyadicMonadic])
&& not (isAssocOperator op))
r <- operand r <- operand
return $ A.FunctionCall m o [l, r] return $ A.FunctionCall m o [l, r]
<|> associativeOpExpression <|> associativeOpExpression
@ -890,6 +892,7 @@ isAssocOperator "AND" = True
isAssocOperator "OR" = True isAssocOperator "OR" = True
isAssocOperator "PLUS" = True isAssocOperator "PLUS" = True
isAssocOperator "TIMES" = True isAssocOperator "TIMES" = True
isAssocOperator _ = False
udOperator :: (String -> Bool) -> OccParser A.Name udOperator :: (String -> Bool) -> OccParser A.Name
udOperator isOp = do m <- md udOperator isOp = do m <- md