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

Moved some functions into TestUtil from RainParseTest

Browse Source
This commit is contained in:
Neil Brown 2007-08-16 12:17:49 +00:00
parent 151134e70a
commit 5ee2303dc7
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
RainParseTest.hs
View File

@ -51,42 +51,6 @@ makeIf list = A.If m $ A.Several m (map makeChoice list)
dyExp :: A.DyadicOp -> A.Variable -> A.Variable -> A.Expression
dyExp op v0 v1 = A.Dyadic m op (A.ExprVariable m v0) (A.ExprVariable m v1)
makeAssign :: A.Variable -> A.Expression -> A.Process
makeAssign v e = A.Assign m [v] $ A.ExpressionList m [e]
makeLiteralString :: String -> A.Expression
makeLiteralString str = A.Literal m (A.Array [A.Dimension (length str)] A.Byte) (A.ArrayLiteral m (map makeLiteralChar str))
where
makeLiteralChar :: Char -> A.ArrayElem
makeLiteralChar c = A.ArrayElemExpr $ A.Literal m A.Byte (A.ByteLiteral m [c] {-(show (fromEnum c))-})
data EachType = Seq | Par
makeEach :: EachType -> String -> A.Type -> A.Expression -> A.Process -> A.Process
makeEach ty loopVar listType listVar body
= case listSpec of
Nothing -> A.Seq m builtRep
Just lspec -> A.Seq m $ A.Spec m lspec builtRep
where
-- Possibly put list into temporary:
(actualListVar,listSpec) = calcListVar listVar listType
-- Produce the loop using a replicator:
rep = A.For m (simpleName (loopVar ++ ".index")) (A.Literal m A.Int (A.IntLiteral m "0")) (A.SizeExpr m (A.ExprVariable m actualListVar))
-- Add a specification for abbreviating the array item:
spec = A.Specification m (simpleName loopVar)
(A.Is m A.Abbrev A.Byte (A.SubscriptedVariable m (A.Subscript m (A.ExprVariable m (variable (loopVar ++ ".index")))) actualListVar) )
--TODO workout where the SEQ/PAR distinction goes
builtRep = A.Rep m rep (A.Spec m spec (A.OnlyP m body))
calcListVar :: A.Expression -> A.Type -> (A.Variable,Maybe A.Specification)
calcListVar (A.ExprVariable _ v) _ = (v,Nothing)
--HACK! need proper nonce
calcListVar v ty = (variable var,Just $ A.Specification m (simpleName var) (A.IsExpr m A.ValAbbrev ty v))
where var = "listvar"
testIf :: [ParseTest A.Process]
testIf =
[

11
TestUtil.hs
View File

@ -37,6 +37,17 @@ makePar procList = A.Par m A.PlainPar $ A.Several m (map (\x -> A.OnlyP m x) pro
makeRepPar :: A.Process -> A.Process
makeRepPar proc = A.Par m A.PlainPar $ A.Rep m (A.For m (simpleName "i") (intLiteral 0) (intLiteral 3)) (A.OnlyP m proc)
makeAssign :: A.Variable -> A.Expression -> A.Process
makeAssign v e = A.Assign m [v] $ A.ExpressionList m [e]
makeLiteralString :: String -> A.Expression
makeLiteralString str = A.Literal m (A.Array [A.Dimension (length str)] A.Byte) (A.ArrayLiteral m (map makeLiteralChar str))
where
makeLiteralChar :: Char -> A.ArrayElem
makeLiteralChar c = A.ArrayElemExpr $ A.Literal m A.Byte (A.ByteLiteral m [c] {-(show (fromEnum c))-})
assertEqualCustom :: (Show a) => String -> (a -> a -> Bool) -> a -> a -> Assertion
assertEqualCustom preface cmp expected actual =
unless (cmp actual expected) (assertFailure msg)