Corrected some Rain tests to avoid using the Int type

This commit is contained in:
Neil Brown 2008-03-20 16:42:25 +00:00
parent cd58986721
commit 0e3465afc0
2 changed files with 13 additions and 10 deletions

View File

@ -192,7 +192,10 @@ intLiteralPattern = (stopCaringPattern emptyMeta) . mkPattern . intLiteral
-- | Creates an integer literal 'A.Expression' with the given integer. -- | Creates an integer literal 'A.Expression' with the given integer.
int64Literal :: Integer -> A.Expression int64Literal :: Integer -> A.Expression
int64Literal n = A.Literal emptyMeta A.Int64 $ A.IntLiteral emptyMeta (show n) int64Literal = integerLiteral A.Int64
int32Literal :: Integer -> A.Expression
int32Literal = integerLiteral A.Int32
-- | Creates a 'Pattern' to match an 'A.Expression' instance. -- | Creates a 'Pattern' to match an 'A.Expression' instance.
-- @'assertPatternMatch' ('intLiteralPattern' x) ('intLiteral' x)@ will always succeed. -- @'assertPatternMatch' ('intLiteralPattern' x) ('intLiteral' x)@ will always succeed.

View File

@ -104,20 +104,20 @@ annotateIntTest = TestList
annotateListLiteralTest :: Test annotateListLiteralTest :: Test
annotateListLiteralTest = TestList annotateListLiteralTest = TestList
[ [
testList 0 A.Int [intLiteral 0, intLiteral 1] testList 0 A.Int32 [int32Literal 0, int32Literal 1]
,testList 1 A.Any [] ,testList 1 A.Any []
,testList 2 A.Int [charLiteral 'c', intLiteral 6] ,testList 2 A.Int32 [charLiteral 'c', int32Literal 6]
,testList 3 A.Int64 [intLiteral 3, intLiteral 5, int64Literal 2, ,testList 3 A.Int64 [int32Literal 3, int32Literal 5, int64Literal 2,
intLiteral 2] int32Literal 2]
-- TODO test with variables (and implicit upcasting) -- TODO test with variables (and implicit upcasting)
-- TODO test the type for lists of lists -- TODO test the type for lists of lists
-- TODO test ranges with variables too -- TODO test ranges with variables too
,testRange 1000 A.Int (intLiteral 0) (intLiteral 1) ,testRange 1000 A.Int32 (int32Literal 0) (int32Literal 1)
,testRange 1001 A.Int64 (intLiteral 0) (int64Literal 1) ,testRange 1001 A.Int64 (int32Literal 0) (int64Literal 1)
,testRange 1002 A.Int64 (int64Literal 0) (intLiteral 1) ,testRange 1002 A.Int64 (int64Literal 0) (int32Literal 1)
,testRange 1003 A.Int (charLiteral 'a') (intLiteral 1) ,testRange 1003 A.Int32 (charLiteral 'a') (int32Literal 1)
,testRange 1004 A.Int (intLiteral 0) (charLiteral 'b') ,testRange 1004 A.Int32 (int32Literal 0) (charLiteral 'b')
,testRange 1005 A.Int64 (charLiteral 'e') (int64Literal 1) ,testRange 1005 A.Int64 (charLiteral 'e') (int64Literal 1)
,testRange 1006 A.Int64 (int64Literal 0) (charLiteral 'f') ,testRange 1006 A.Int64 (int64Literal 0) (charLiteral 'f')
,testRange 1007 A.Byte (charLiteral 'd') (charLiteral 'f') ,testRange 1007 A.Byte (charLiteral 'd') (charLiteral 'f')