diff --git a/checks/UsageCheckTest.hs b/checks/UsageCheckTest.hs index 396d26a..af90bf1 100644 --- a/checks/UsageCheckTest.hs +++ b/checks/UsageCheckTest.hs @@ -89,10 +89,6 @@ testGetVarProc = TestList (map doTest tests) ,(200,[tvB],[tvA],[],a_eq_not_b) ,(201,[tvC,tvD],[tvA],[],a_eq_c_plus_d) - -- Test time statements: - ,(300,[],[tvB],[],A.GetTime emptyMeta vB) - ,(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]) diff --git a/checks/UsageCheckUtils.hs b/checks/UsageCheckUtils.hs index bd08560..2f91294 100644 --- a/checks/UsageCheckUtils.hs +++ b/checks/UsageCheckUtils.hs @@ -126,8 +126,6 @@ getVarProc (A.Assign _ vars expList) (mapUnionVars processVarW vars) --All variables read on the RHS: (getVarExpList expList) -getVarProc (A.GetTime _ v) = processVarW v -getVarProc (A.Wait _ _ e) = getVarExp e getVarProc (A.Output _ chanVar outItems) = (processVarUsed chanVar) `unionVars` (mapUnionVars getVarOutputItem outItems) where getVarOutputItem :: A.OutputItem -> Vars diff --git a/data/AST.hs b/data/AST.hs index c6c4037..ab56ee9 100644 --- a/data/AST.hs +++ b/data/AST.hs @@ -357,13 +357,6 @@ data Replicator = data Choice = Choice Meta Expression Process deriving (Show, Eq, Typeable, Data) --- | A mode of waiting -- either for a specified duration, or until a specified --- time. -data WaitMode = - WaitFor - | WaitUntil - deriving (Show, Eq, Ord, Typeable, Data) - -- | A guard in an @ALT@. data Alternative = -- | A plain guard. @@ -377,8 +370,6 @@ data Alternative = -- | A @SKIP@ guard (one that is always ready). -- The 'Expression' is the pre-condition. | AlternativeSkip Meta Expression Process - -- | A @wait for@\/@until@ guard. - | AlternativeWait Meta WaitMode Expression Process deriving (Show, Eq, Typeable, Data) -- | An option in a @CASE@ process. @@ -557,8 +548,6 @@ data Process = | Input Meta Variable InputMode | Output Meta Variable [OutputItem] | OutputCase Meta Variable Name [OutputItem] - | GetTime Meta Variable - | Wait Meta WaitMode Expression -- | Clears the given mobile variable; if the variable is currently NULL, -- destroy the contents and make it NULL. If it is already NULL, do nothing. | ClearMobile Meta Variable diff --git a/flow/FlowGraph.hs b/flow/FlowGraph.hs index 44c966f..68c0465 100644 --- a/flow/FlowGraph.hs +++ b/flow/FlowGraph.hs @@ -536,7 +536,6 @@ buildOnlyAlternative route alt (A.Alternative m _ _ p) -> (m,p, route44 route A.Alternative) (A.AlternativeCond m _ _ _ p) -> (m,p, route55 route A.AlternativeCond) (A.AlternativeSkip m _ p) -> (m,p, route33 route A.AlternativeSkip) - (A.AlternativeWait m _ _ p) -> (m,p, route44 route A.AlternativeWait) guardNode <- addNode' m labelAlternative alt (AlterAlternative route) (bodyNodeStart, bodyNodeEnd) <- buildProcess p r addEdge ESeq guardNode bodyNodeStart diff --git a/flow/FlowGraphTest.hs b/flow/FlowGraphTest.hs index d5aee25..517e10e 100644 --- a/flow/FlowGraphTest.hs +++ b/flow/FlowGraphTest.hs @@ -688,8 +688,6 @@ genProcess n = nextIdT >>* makeMeta' >>= \m -> (flip oneofLS) n ,(1,comb1 (A.If emptyMeta) . genStructured genChoice') ,(2,comb2 (A.Case emptyMeta) genExpression . genStructured genOption' . sub1) ,(2,const $ genElem3 A.Assign m (comb0 [variable "x"]) genExpressionList) - ,(1,const $ genElem2 A.GetTime m (comb0 $ variable "x")) - ,(1,const $ genElem3 A.Wait m (comb0 A.WaitFor) genExpression) ,(2,comb1 (A.Alt emptyMeta True) . genStructured genAlternative' . sub1) ]