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

Rain: changed the declaration parser to also return a Meta tag

Browse Source
This commit is contained in:
Neil Brown 2007-08-23 14:58:11 +00:00
parent cab4ec2113
commit 5adbf7fcfc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RainParse.hs
View File

@ -245,9 +245,9 @@ tupleDef = do {sLeftR ; tm <- sepBy tupleDefMember sComma ; sRightR ; return tm}
tupleDefMember :: RainParser (A.Name,A.Type)
tupleDefMember = do {t <- dataType ; sColon ; n <- name ; return (n,t)}
declaration :: RainParser (A.Structured -> A.Structured)
declaration :: RainParser (Meta,A.Structured -> A.Structured)
declaration = do {t <- dataType; sColon ; n <- name ; sSemiColon ;
return $ A.Spec (findMeta t) $ A.Specification (findMeta t) n $ A.Declaration (findMeta t) t }
return (findMeta t, A.Spec (findMeta t) $ A.Specification (findMeta t) n $ A.Declaration (findMeta t) t) }
topLevelDecl :: RainParser A.Structured
topLevelDecl = do {m <- sProcess ; procName <- name ; params <- tupleDef ; body <- block ;

8
RainParseTest.hs
View File

@ -252,7 +252,7 @@ testDataType =
,fail ("int?int",RP.dataType)
]
testDecl :: [ParseTest (A.Structured -> A.Structured)]
testDecl :: [ParseTest (Meta, A.Structured -> A.Structured)]
testDecl =
[
passd ("bool: b;",0,tag3 A.Specification DontCare (simpleNamePattern "b") $ tag2 A.Declaration DontCare A.Bool)
@ -268,10 +268,10 @@ testDecl =
,fail ("bool:?b;",RP.declaration)
]
where
passd :: (String,Int,Pattern) -> ParseTest (A.Structured -> A.Structured)
passd :: (String,Int,Pattern) -> ParseTest (Meta, A.Structured -> A.Structured)
passd (code,index,exp) = pass(code,RP.declaration,check ("testDecl " ++ (show index)) exp)
check :: String -> Pattern -> (A.Structured -> A.Structured) -> Assertion
check msg spec act = assertPatternMatch msg (tag3 A.Spec DontCare spec $ A.Several m []) (act $ A.Several m [])
check :: String -> Pattern -> (Meta, A.Structured -> A.Structured) -> Assertion
check msg spec (_,act) = assertPatternMatch msg (tag3 A.Spec DontCare spec $ A.Several m []) (act $ A.Several m [])
testComm :: [ParseTest A.Process]
testComm =