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

Rain: tidied up ParseRain a little

Browse Source
This commit is contained in:
Neil Brown 2007-09-19 12:03:24 +00:00
parent 4e635d84ba
commit ebf3040367
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontends/ParseRain.hs
View File

@ -161,11 +161,14 @@ dataType
<|> do {(m,n) <- identifier ; return $ A.UserDataType A.Name {A.nameMeta = m, A.nameName = n, A.nameType = A.DataTypeName}} <|> do {(m,n) <- identifier ; return $ A.UserDataType A.Name {A.nameMeta = m, A.nameName = n, A.nameType = A.DataTypeName}}
<?> "data type" <?> "data type"
variableId :: RainParser A.Variable variable :: RainParser A.Variable
variableId = do {v <- name ; return $ A.Variable (findMeta v) v} variable = do {v <- name ; return $ A.Variable (findMeta v) v}
<|> try (do {m <- sIn ; v <- variableId ; return $ A.DirectedVariable m A.DirInput v}) <|> try (do {m <- sIn ; v <- variable ; return $ A.DirectedVariable m A.DirInput v})
<|> try (do {m <- sOut ; v <- variableId ; return $ A.DirectedVariable m A.DirOutput v}) <|> try (do {m <- sOut ; v <- variable ; return $ A.DirectedVariable m A.DirOutput v})
<?> "variable name" <?> "variable"
lvalue :: RainParser A.Variable
lvalue = variable
stringLiteral :: RainParser (A.LiteralRepr, A.Dimension) stringLiteral :: RainParser (A.LiteralRepr, A.Dimension)
stringLiteral stringLiteral
@ -237,7 +240,7 @@ expression
foldOps lhs (m,op,rhs) = A.Dyadic m op lhs rhs foldOps lhs (m,op,rhs) = A.Dyadic m op lhs rhs
subExpr' :: RainParser A.Expression subExpr' :: RainParser A.Expression
subExpr' = do {id <- variableId ; return $ A.ExprVariable (findMeta id) id} subExpr' = do {id <- variable ; return $ A.ExprVariable (findMeta id) id}
<|> literal <|> literal
<|> range <|> range
<|> do {(m,op) <- monadicArithOp ; rhs <- subExpr' ; return $ A.Monadic m op rhs} <|> do {(m,op) <- monadicArithOp ; rhs <- subExpr' ; return $ A.Monadic m op rhs}
@ -297,9 +300,6 @@ assignOp
<|> do {m <- reserved "%=" ; return (m,Just A.Rem)} <|> do {m <- reserved "%=" ; return (m,Just A.Rem)}
<|> do {m <- reserved "=" ; return (m,Nothing)} <|> do {m <- reserved "=" ; return (m,Nothing)}
lvalue :: RainParser A.Variable
--For now, only handle plain variables:
lvalue = variableId
each :: RainParser A.Process each :: RainParser A.Process
each = do { m <- sPareach ; sLeftR ; n <- name ; sColon ; exp <- expression ; sRightR ; st <- statement ; each = do { m <- sPareach ; sLeftR ; n <- name ; sColon ; exp <- expression ; sRightR ; st <- statement ;