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

Added support for output statements to the usage checker

Browse Source
This commit is contained in:
Neil Brown 2007-10-29 18:29:29 +00:00
parent 1f97bc7d49
commit 5280bb4fc6
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transformations/RainUsageCheck.hs
View File

@ -68,6 +68,9 @@ unionVars (Vars mr mw dw u) (Vars mr' mw' dw' u') = Vars (mr `Set.union` mr') (m
foldUnionVars :: [Vars] -> Vars foldUnionVars :: [Vars] -> Vars
foldUnionVars = foldl unionVars emptyVars foldUnionVars = foldl unionVars emptyVars
mapUnionVars :: (a -> Vars) -> [a] -> Vars
mapUnionVars f = foldUnionVars . (map f)
nameToString :: A.Name -> String nameToString :: A.Name -> String
nameToString = A.nameName nameToString = A.nameName
@ -86,7 +89,12 @@ getVarProc (A.Assign _ vars expList)
(getVarExpList expList) (getVarExpList expList)
getVarProc (A.GetTime _ v) = processVarW v getVarProc (A.GetTime _ v) = processVarW v
getVarProc (A.Wait _ _ e) = getVarExp e getVarProc (A.Wait _ _ e) = getVarExp e
--TODO output input etc (all other processes that directly write to/read from variables) getVarProc (A.Output _ chanVar outItems) = (processVarUsed chanVar) `unionVars` (mapUnionVars getVarOutputItem outItems)
where
getVarOutputItem :: A.OutputItem -> Vars
getVarOutputItem (A.OutExpression _ e) = getVarExp e
getVarOutputItem (A.OutCounted _ ce ae) = (getVarExp ce) `unionVars` (getVarExp ae)
--TODO input etc (all other processes that directly write to/read from variables)
getVarProc _ = emptyVars getVarProc _ = emptyVars
{- {-

10
transformations/RainUsageCheckTest.hs
View File

@ -31,7 +31,7 @@ import RainUsageCheck
--Shorthands for some variables to simplify the list of tests in this file --Shorthands for some variables to simplify the list of tests in this file
vA = variable "a" vA = variable "a"
vB = A.DerefVariable emptyMeta $ variable "b" vB = A.DerefVariable emptyMeta $ variable "b"
vC = variable "c" vC = A.DirectedVariable emptyMeta A.DirInput $ variable "c"
vD = variable "d" vD = variable "d"
vL = variable "l" vL = variable "l"
l0 = intLiteral 0 l0 = intLiteral 0
@ -39,7 +39,7 @@ l1 = intLiteral 1
tvA = Plain "a" tvA = Plain "a"
tvB = Deref "b" tvB = Deref "b"
tvC = Plain "c" tvC = Dir A.DirInput "c"
tvD = Plain "d" tvD = Plain "d"
tvL = Plain "l" tvL = Plain "l"
@ -81,7 +81,11 @@ testGetVarProc = TestList (map doTest tests)
,(300,[],[tvB],[tvB],[],A.GetTime emptyMeta vB) ,(300,[],[tvB],[tvB],[],A.GetTime emptyMeta vB)
,(301,[tvA],[],[],[],A.Wait emptyMeta A.WaitFor $ A.ExprVariable emptyMeta vA) ,(301,[tvA],[],[],[],A.Wait emptyMeta A.WaitFor $ A.ExprVariable emptyMeta vA)
-- Test simple outputs:
,(400,[tvA],[],[],[tvC],A.Output emptyMeta vC [A.OutExpression emptyMeta $ A.ExprVariable emptyMeta vA])
,(401,[tvA,tvB],[],[],[tvC],A.Output emptyMeta vC $ map ((A.OutExpression emptyMeta) . (A.ExprVariable emptyMeta)) [vA,vB])
,(402,[tvA,tvB],[],[],[tvC],A.Output emptyMeta vC
[A.OutCounted emptyMeta (A.ExprVariable emptyMeta vA) (A.ExprVariable emptyMeta vB)])
] ]
doTest :: (Int,[Var],[Var],[Var],[Var],A.Process) -> Test doTest :: (Int,[Var],[Var],[Var],[Var],A.Process) -> Test