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

Rain: changed innerBlock to pass the tests

Browse Source
This commit is contained in:
Neil Brown 2007-08-23 14:59:45 +00:00
parent f0d06b5219
commit 9077367f6d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RainParse.hs
View File

@ -184,10 +184,15 @@ subExpression
<?> "[sub-]expression"
innerBlock :: RainParser A.Structured
innerBlock = do {m <- sLeftC ; procs <- (many statement) ; sts <- sequence (map wrapProc procs) ; sRightC ; return $ A.Several m sts}
innerBlock = do {m <- sLeftC ; lines <- linesToEnd ; return $ A.Several m lines}
where
wrapProc :: A.Process -> RainParser A.Structured
wrapProc x = return (A.OnlyP (findMeta x) x)
wrapProc :: A.Process -> A.Structured
wrapProc x = A.OnlyP (findMeta x) x
linesToEnd :: RainParser [A.Structured]
linesToEnd = do {(m,decl) <- declaration ; rest <- linesToEnd ; return [decl $ A.Several m rest]}
<|> do {st <- statement ; rest <- linesToEnd ; return $ (wrapProc st) : rest}
<|> do {sRightC ; return []}
<?> "statement, declaration, or end of block"
block :: RainParser A.Process
block = do { optionalSeq ; b <- innerBlock ; return $ A.Seq (findMeta b) b}