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

Rain: added a skeleton pass for recording type names in CompState, and wrote a test for it

Browse Source
This commit is contained in:
Neil Brown 2007-08-18 16:56:25 +00:00
parent d7dc28ce47
commit bc24ba16b1
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
RainPassTest.hs
View File

@ -156,8 +156,20 @@ testUnique2 = testPassWithCheck "testUnique2" exp (uniquifyAndResolveVars orig)
(tag2 A.OnlyP m $ tag3 A.Assign DontCare [tag2 A.Variable DontCare (Named "newc" DontCare)] (tag2 A.ExpressionList DontCare [(exprVariable "d")])) (tag2 A.OnlyP m $ tag3 A.Assign DontCare [tag2 A.Variable DontCare (Named "newc" DontCare)] (tag2 A.ExpressionList DontCare [(exprVariable "d")]))
check items = assertItemNotEqual "testUnique2: Variable was not made unique" (simpleName "c") (Map.lookup "newc" items) check items = assertItemNotEqual "testUnique2: Variable was not made unique" (simpleName "c") (Map.lookup "newc" items)
assertVarDef :: Data a => String -> CompState -> String -> a -> Assertion
assertVarDef prefix state varName varDef
= case (Map.lookup varName (csNames state)) of
Nothing -> assertFailure $ prefix ++ " variable was not recorded: " ++ varName
Just actVarDef -> assertPatternMatch (prefix ++ " variable definition not as expected for " ++ varName) varDef actVarDef
testRecordNames0 :: Test
testRecordNames0 = testPassWithStateCheck "testRecordNames0" exp (recordNameTypes orig) (return ()) check
where
orig = (A.Specification m (simpleName "c") $ A.Declaration m A.Byte)
exp = orig
check state = assertVarDef "testRecordNames0" state "c" (tag7 A.NameDef DontCare "c" "c" A.VariableName (A.Declaration m A.Byte) A.Original A.Unplaced)
--Returns the list of tests: --Returns the list of tests:
tests :: Test tests :: Test
tests = TestList tests = TestList
@ -167,6 +179,7 @@ tests = TestList
,testUnique0 ,testUnique0
,testUnique1 ,testUnique1
,testUnique2 ,testUnique2
,testRecordNames0
] ]

3
RainPasses.hs
View File

@ -16,6 +16,7 @@ rainPasses = runPasses passes
where where
passes = passes =
[ ("Uniquify variable declarations and resolve variable names",uniquifyAndResolveVars) [ ("Uniquify variable declarations and resolve variable names",uniquifyAndResolveVars)
,("Record name types in dictionary",recordNameTypes)
,("Convert seqeach/pareach loops into classic replicated SEQ/PAR",transformEach) ,("Convert seqeach/pareach loops into classic replicated SEQ/PAR",transformEach)
] ]
@ -32,6 +33,8 @@ uniquifyAndResolveVars = everywhereM (mkM uniquifyAndResolveVars')
replaceNameName :: String -> String -> A.Name -> A.Name replaceNameName :: String -> String -> A.Name -> A.Name
replaceNameName find replace n = if (A.nameName n) == find then n {A.nameName = replace} else n replaceNameName find replace n = if (A.nameName n) == find then n {A.nameName = replace} else n
recordNameTypes :: Data t => t -> PassM t
recordNameTypes = return
transformEach :: Data t => t -> PassM t transformEach :: Data t => t -> PassM t