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

Fixed the tests for parsing Rain functions, using the new Process body with functionname = returnvalue plan

Browse Source
This commit is contained in:
Neil Brown 2008-02-25 17:17:38 +00:00
parent 4f05f0126f
commit 839c8ebe7c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontends/ParseRainTest.hs
View File

@ -407,11 +407,11 @@ testBlock =
,passBlock (5, "{ uint8: x; }", False, ,passBlock (5, "{ uint8: x; }", False,
A.Spec m (A.Specification m (simpleName "x") $ A.Declaration m A.Byte noInit) emptySeveral) A.Spec m (A.Specification m (simpleName "x") $ A.Declaration m A.Byte noInit) emptySeveral)
,fail("{b}",RP.innerBlock False) ,fail("{b}",RP.innerBlock False Nothing)
] ]
where where
passBlock :: (Int, String, Bool, A.Structured A.Process) -> ParseTest (A.Structured A.Process) passBlock :: (Int, String, Bool, A.Structured A.Process) -> ParseTest (A.Structured A.Process)
passBlock (ind, input, b, exp) = pass (input, RP.innerBlock b, assertPatternMatch ("testBlock " ++ show ind) (pat exp)) passBlock (ind, input, b, exp) = pass (input, RP.innerBlock b Nothing, assertPatternMatch ("testBlock " ++ show ind) (pat exp))
testEach :: [ParseTest A.Process] testEach :: [ParseTest A.Process]
testEach = testEach =
@ -453,21 +453,19 @@ testTopLevelDecl =
, fail ("process foo (int: x)", RP.topLevelDecl) , fail ("process foo (int: x)", RP.topLevelDecl)
, fail ("process foo (int x) {}", RP.topLevelDecl) , fail ("process foo (int x) {}", RP.topLevelDecl)
{- TODO get functions going again
,passTop (100, "function uint8: cons() {}", ,passTop (100, "function uint8: cons() {}",
[A.Spec m (A.Specification m (simpleName "cons") $ A.Function m A.PlainSpec [A.Byte] [] $ A.Only m emptyBlock) emptySeveral]) [A.Spec m (A.Specification m (simpleName "cons") $ A.Function m A.PlainSpec [A.Byte] [] $ Right emptyBlock) emptySeveral])
,passTop (101, "function uint8: f(uint8: x) {}", ,passTop (101, "function uint8: f(uint8: x) {}",
[A.Spec m (A.Specification m (simpleName "f") $ [A.Spec m (A.Specification m (simpleName "f") $
A.Function m A.PlainSpec [A.Byte] [A.Formal A.ValAbbrev A.Byte (simpleName "x")] $ A.Only m emptyBlock) A.Function m A.PlainSpec [A.Byte] [A.Formal A.ValAbbrev A.Byte (simpleName "x")] $ Right emptyBlock)
emptySeveral]) emptySeveral])
,passTop (102, "function uint8: id(uint8: x) {return x;}", ,passTop (102, "function uint8: id(uint8: x) {return x;}",
[A.Spec m (A.Specification m (simpleName "id") $ [A.Spec m (A.Specification m (simpleName "id") $
A.Function m A.PlainSpec [A.Byte] [A.Formal A.ValAbbrev A.Byte (simpleName "x")] $ A.Function m A.PlainSpec [A.Byte] [A.Formal A.ValAbbrev A.Byte (simpleName "x")] $ Right $
A.Only m $ A.Seq m $ A.Several m [A.Only m $ A.ExpressionList m [exprVariable "x"]]) A.Seq m $ A.Several m [A.Only m $ A.Assign m [variable "id"] (A.ExpressionList m [exprVariable "x"])])
emptySeveral]) emptySeveral])
-}
] ]
where where
passTop :: (Int, String, [A.AST]) -> ParseTest A.AST passTop :: (Int, String, [A.AST]) -> ParseTest A.AST