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

Rain: added more type-checkers tests, all of which pass

Browse Source
This commit is contained in:
Neil Brown 2007-09-15 21:19:16 +00:00
parent 15ce5fee06
commit 3301207a97
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontends/RainTypes.hs
View File

@ -123,6 +123,13 @@ checkExpressionTypes = everywhereASTM checkExpression
A.Bool -> return e A.Bool -> return e
_ -> dieP m $ "Cannot apply unary not to non-boolean type: " ++ show trhs _ -> dieP m $ "Cannot apply unary not to non-boolean type: " ++ show trhs
else dieP m $ "Invalid Rain operator: \"" ++ show op ++ "\"" else dieP m $ "Invalid Rain operator: \"" ++ show op ++ "\""
checkExpression e@(A.Conversion m cm dest rhs)
= do src <- typeOfExpression rhs
if (src == dest)
then return e
else if isImplicitConversionRain src dest
then return e
else dieP m $ "Invalid cast from: " ++ show dest ++ " to: " ++ show src
checkExpression e = return e checkExpression e = return e
convert :: A.Type -> A.Type -> A.Expression -> A.Expression convert :: A.Type -> A.Type -> A.Expression -> A.Expression

25
frontends/RainTypesTest.hs
View File

@ -123,6 +123,15 @@ checkExpressionTest = TestList
,fail 604 $ Dy (Var "b") A.Plus (Var "b") ,fail 604 $ Dy (Var "b") A.Plus (Var "b")
,fail 605 $ Dy (Var "b") A.Less (Var "b") ,fail 605 $ Dy (Var "b") A.Less (Var "b")
--Comparisons between different integer types:
,pass 700 A.Bool (Dy (Var "x") A.Eq (Cast A.Int64 $ Var "xu8")) (Dy (Var "x") A.Eq (Var "xu8"))
,pass 701 A.Bool (Dy (Cast A.Int32 $ Var "x16") A.Less (Cast A.Int32 $ Var "xu16")) (Dy (Var "x16") A.Less (Var "xu16"))
,pass 702 A.Bool (Dy (Var "x") A.More (Cast A.Int64 $ Cast A.Int32 $ Var "xu8")) (Dy (Var "x") A.More (Cast A.Int32 $ Var "xu8"))
,fail 703 $ Dy (Var "x") A.Less (Var "xu64")
,pass 704 A.Bool (Dy (Var "x16") A.NotEq (Cast A.Int16 $ int A.Int8 100)) (Dy (Var "x16") A.NotEq (int A.Int8 100))
,pass 705 A.Bool (Dy (Cast A.Int16 $ Var "x8") A.MoreEq (int A.Int16 200)) (Dy (Var "x8") A.MoreEq (int A.Int16 200))
--Booleans (easy!) --Booleans (easy!)
,passSame 1000 A.Bool $ Mon A.MonadicNot (Var "b") ,passSame 1000 A.Bool $ Mon A.MonadicNot (Var "b")
,passSame 1001 A.Bool $ Dy (Var "b") A.Or (Var "b") ,passSame 1001 A.Bool $ Dy (Var "b") A.Or (Var "b")
@ -135,6 +144,22 @@ checkExpressionTest = TestList
,passSame 1103 A.Bool $ Dy (Var "x") A.Less (Var "x") ,passSame 1103 A.Bool $ Dy (Var "x") A.Less (Var "x")
,passSame 1104 A.Bool $ Dy (Dy (Var "x") A.Eq (Var "x")) A.And (Dy (Var "xu8") A.NotEq (Var "xu8")) ,passSame 1104 A.Bool $ Dy (Dy (Var "x") A.Eq (Var "x")) A.And (Dy (Var "xu8") A.NotEq (Var "xu8"))
--Invalid casts:
,fail 2000 $ Cast A.Bool (Var "x")
,fail 2001 $ Cast A.Bool (int A.Int8 0)
,fail 2002 $ Cast A.Int8 (Var "b")
,fail 2003 $ Cast A.Int8 (Var "x")
,fail 2004 $ Cast A.Int8 (Var "xu8")
,fail 2005 $ Cast A.Byte (Var "x8")
,fail 2006 $ Cast A.UInt64 (Var "x8")
--Valid casts:
,passSame 2100 A.Bool $ Cast A.Bool (Var "b")
,passSame 2101 A.Int64 $ Cast A.Int64 (Var "x")
,passSame 2102 A.Int64 $ Cast A.Int64 (Var "x8")
,passSame 2103 A.Int64 $ Cast A.Int64 (Var "xu8")
,passSame 2104 A.Int64 $ Cast A.Int64 $ Cast A.Int32 $ Cast A.UInt16 $ Var "xu8"
,passSame 2105 A.UInt64 $ Cast A.UInt64 (Var "xu8")
] ]
where where
passSame :: Int -> A.Type -> ExprHelper -> Test passSame :: Int -> A.Type -> ExprHelper -> Test