[project @ 1999-05-10 10:12:25 by simonm]

Test fixes.

diff --git a/ghc/tests/numeric/should_run/Makefile b/ghc/tests/numeric/should_run/Makefile
index 559dbbe..22a203c 100644 (file)
--- a/ghc/tests/numeric/should_run/Makefile
+++ b/ghc/tests/numeric/should_run/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.4 1999/01/24 14:19:43 sof Exp $
+# $Id: Makefile,v 1.5 1999/05/10 10:12:25 simonm Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
@@ -9,6 +9,7 @@ HC_OPTS += -dcore-lint
 arith010_HC_OPTS += -fglasgow-exts
 arith011_HC_OPTS += -fglasgow-exts
 arith012_HC_OPTS += -fglasgow-exts
+num006_HC_OPTS += -fglasgow-exts
 
 .PRECIOUS: %.bin %.o
 

diff --git a/ghc/tests/numeric/should_run/arith010.stdout b/ghc/tests/numeric/should_run/arith010.stdout
index 881278a..e6a2b37 100644 (file)
--- a/ghc/tests/numeric/should_run/arith010.stdout
+++ b/ghc/tests/numeric/should_run/arith010.stdout
@@ -1,8 +1,8 @@
 [1,2,3,4,5,6,7,8,9,10]
-[10,9,8,7,6,5,4,3,2,1]
+[]
 [1,3,5,7,9]
 [10,8,6,4,2]
 "abcdef"
-"fedcba"
+""
 "acegikm"
 "mlkjihgfedcba"

diff --git a/ghc/tests/numeric/should_run/num001.hs b/ghc/tests/numeric/should_run/num001.hs
index a27e0d2..879605b 100644 (file)
--- a/ghc/tests/numeric/should_run/num001.hs
+++ b/ghc/tests/numeric/should_run/num001.hs
@@ -1,5 +1,6 @@
 module Main(main) where
 
 import Numeric
+import Ratio
 
 main = print ((fromRat (132874 % 23849))::Double)

diff --git a/ghc/tests/numeric/should_run/num002.hs b/ghc/tests/numeric/should_run/num002.hs
index b0de2bf..917dcab 100644 (file)
--- a/ghc/tests/numeric/should_run/num002.hs
+++ b/ghc/tests/numeric/should_run/num002.hs
@@ -9,7 +9,7 @@ main =
    putStrLn (showInt (343023920121::Integer) [])
    putStrLn (showInt (3430239::Int) [])
    putStrLn (showInt (1212 :: Int) [])
-   putStrLn (showInt (591125662431 `div` (517::Int)) [])
+   putStrLn (showInt (5911256624 `div` (517::Int)) [])
    -- showInt just works over naturals, wrap it up inside
    -- a use of Numeric.showSigned to show negative nums.
    putStrLn (showSigned (showInt) 0 (-111::Int) [])

diff --git a/ghc/tests/numeric/should_run/num002.stdout b/ghc/tests/numeric/should_run/num002.stdout
index 3b8e1e8..902b262 100644 (file)
--- a/ghc/tests/numeric/should_run/num002.stdout
+++ b/ghc/tests/numeric/should_run/num002.stdout
@@ -1,6 +1,6 @@
 343023920121
 3430239
 1212
-1097986
+3126284
 -111
 232189458241

diff --git a/ghc/tests/numeric/should_run/num003.stdout b/ghc/tests/numeric/should_run/num003.stdout
index 007cd36..c637f98 100644 (file)
--- a/ghc/tests/numeric/should_run/num003.stdout
+++ b/ghc/tests/numeric/should_run/num003.stdout
@@ -1,6 +1,6 @@
-[(343023920121, "")]
-[(3430239, "")]
-[(1212, "")]
-[(1097986, "")]
+[(343023920121,"")]
+[(3430239,"")]
+[(1212,"")]
 []
-[(232189458241, "")]
+[]
+[(232189458241,"")]

diff --git a/ghc/tests/numeric/should_run/num004.stdout b/ghc/tests/numeric/should_run/num004.stdout
index e6959bf..12610a1 100644 (file)
--- a/ghc/tests/numeric/should_run/num004.stdout
+++ b/ghc/tests/numeric/should_run/num004.stdout
@@ -1,6 +1,6 @@
-[(343023920121, "")]
-[(3430239, "")]
-[(0, "")]
-[(1097986, "")]
-[(-111, "")]
-[(232189458241, "")]
+[(343023920121,"")]
+[(3430239,"")]
+[(0,"")]
+[(-3055754,"")]
+[(-111,"")]
+[(232189458241,"")]

diff --git a/ghc/tests/numeric/should_run/num005.stdout b/ghc/tests/numeric/should_run/num005.stdout
new file mode 100644 (file)
index 0000000..f6ba218
--- /dev/null
+++ b/ghc/tests/numeric/should_run/num005.stdout
@@ -0,0 +1,55 @@
+
+(readDec::ReadS Integer) 3489348394032498320438240938403 = [(3489348394032498320438240938403,"")]
+(readDec::ReadS Integer) 0 = [(0,"")]
+(readDec::ReadS Integer) -1 = []
+(readDec::ReadS Integer) 1 = [(1,"")]
+(readDec::ReadS Integer) 34323 = [(34323,"")]
+(readDec::ReadS Integer) 2L = [(2,"L")]
+(readDec::ReadS Integer) 012 = [(12,"")]
+(readDec::ReadS Integer) 0x23 = [(0,"x23")]
+(readDec::ReadS Integer) 3243ab = [(3243,"ab")]
+(readDec::ReadS Int) 3489348394032498320438240938403 = [(-1268053597,"")]
+(readDec::ReadS Int) 0 = [(0,"")]
+(readDec::ReadS Int) -1 = []
+(readDec::ReadS Int) 1 = [(1,"")]
+(readDec::ReadS Int) 34323 = [(34323,"")]
+(readDec::ReadS Int) 2L = [(2,"L")]
+(readDec::ReadS Int) 012 = [(12,"")]
+(readDec::ReadS Int) 0x23 = [(0,"x23")]
+(readDec::ReadS Int) 3243ab = [(3243,"ab")]
+(readOct::ReadS Integer) 3489348394032498320438240938403 = [(28,"89348394032498320438240938403")]
+(readOct::ReadS Integer) 0 = [(0,"")]
+(readOct::ReadS Integer) -1 = []
+(readOct::ReadS Integer) 1 = [(1,"")]
+(readOct::ReadS Integer) 34323 = [(14547,"")]
+(readOct::ReadS Integer) 2L = [(2,"L")]
+(readOct::ReadS Integer) 012 = [(10,"")]
+(readOct::ReadS Integer) 0x23 = [(0,"x23")]
+(readOct::ReadS Integer) 3243ab = [(1699,"ab")]
+(readOct::ReadS Int) 3489348394032498320438240938403 = [(28,"89348394032498320438240938403")]
+(readOct::ReadS Int) 0 = [(0,"")]
+(readOct::ReadS Int) -1 = []
+(readOct::ReadS Int) 1 = [(1,"")]
+(readOct::ReadS Int) 34323 = [(14547,"")]
+(readOct::ReadS Int) 2L = [(2,"L")]
+(readOct::ReadS Int) 012 = [(10,"")]
+(readOct::ReadS Int) 0x23 = [(0,"x23")]
+(readOct::ReadS Int) 3243ab = [(1699,"ab")]
+(readHex::ReadS Integer) 3489348394032498320438240938403 = [(4364516597526947317207336190131536899,"")]
+(readHex::ReadS Integer) 0 = [(0,"")]
+(readHex::ReadS Integer) -1 = []
+(readHex::ReadS Integer) 1 = [(1,"")]
+(readHex::ReadS Integer) 34323 = [(213795,"")]
+(readHex::ReadS Integer) 2L = [(2,"L")]
+(readHex::ReadS Integer) 012 = [(18,"")]
+(readHex::ReadS Integer) 0x23 = [(0,"x23")]
+(readHex::ReadS Integer) 3243ab = [(3294123,"")]
+(readHex::ReadS Int) 3489348394032498320438240938403 = [(1083409411,"")]
+(readHex::ReadS Int) 0 = [(0,"")]
+(readHex::ReadS Int) -1 = []
+(readHex::ReadS Int) 1 = [(1,"")]
+(readHex::ReadS Int) 34323 = [(213795,"")]
+(readHex::ReadS Int) 2L = [(2,"L")]
+(readHex::ReadS Int) 012 = [(18,"")]
+(readHex::ReadS Int) 0x23 = [(0,"x23")]
+(readHex::ReadS Int) 3243ab = [(3294123,"")]

diff --git a/ghc/tests/numeric/should_run/num006.stdout b/ghc/tests/numeric/should_run/num006.stdout
index 2645af1..2de13d0 100644 (file)
--- a/ghc/tests/numeric/should_run/num006.stdout
+++ b/ghc/tests/numeric/should_run/num006.stdout
@@ -1,8 +1,6 @@
-["0o1", "0o2", "0o3", "0o4", "0o5", "0o6", "0o7", "0o10", "0o11", "0o12", "0o13", "0o14", "0o15", "0o16", "0o17", "0o20", "0o21", "0o22", "0o23", "0o24", "0o25", "0o26", "0o27", "0o30", "0o31", "0o32", "0o33", "0o34", "0o35", "0o36", "0o37", "0o40"]
-["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32"]
-["0x1", "0x2", "0x3", "0x4", "0x5", "0x6", "0x7", "0x8", "0x9", "0xa", "0xb", "0xc", "0xd", "0xe", "0xf", "0x10", "0x11", "0x12", "0x13", "0x14", "0x15", "0x16", "0x17", "0x18", "0x19", "0x1a", "0x1b", "0x1c", "0x1d", "0x1e", "0x1f", "0x20"]
-["0b1", "0b10", "0b11", "0b100", "0b101", "0b110", "0b111", "0b1000", "0b1001", "0b1010", "0b1011", "0b1100", "0b1101", "0b1110", "0b1111", "0b10000", "0b10001", "0b10010", "0b10011", "0b10100", "0b10101", "0b10110", "0b10111", "0b11000", "0b11001", "0b11010", "0b11011", "0b11100", "0b11101", "0b11110", "0b11111", "0b100000"]
+["0o1","0o2","0o3","0o4","0o5","0o6","0o7","0o10","0o11","0o12","0o13","0o14","0o15","0o16","0o17","0o20","0o21","0o22","0o23","0o24","0o25","0o26","0o27","0o30","0o31","0o32","0o33","0o34","0o35","0o36","0o37","0o40"]
+["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31","32"]
+["0x1","0x2","0x3","0x4","0x5","0x6","0x7","0x8","0x9","0xa","0xb","0xc","0xd","0xe","0xf","0x10","0x11","0x12","0x13","0x14","0x15","0x16","0x17","0x18","0x19","0x1a","0x1b","0x1c","0x1d","0x1e","0x1f","0x20"]
 0o1630451360
 241324784
 0xe6252f0
-0b1110011000100101001011110000

diff --git a/ghc/tests/numeric/should_run/num007.stdout b/ghc/tests/numeric/should_run/num007.stdout
index 70609a6..ef60021 100644 (file)
--- a/ghc/tests/numeric/should_run/num007.stdout
+++ b/ghc/tests/numeric/should_run/num007.stdout
@@ -1,9 +1,9 @@
-"[(73, \"\")]"
-"[(111, \"\")]"
-"[(273, \"\")]"
-"[]"
-"[]"
-"[]"
-"[(212, \"8784372843778438743\")]"
-"[(3248784372843778438743, \"\")]"
-"[(60788519836879239998834499, \"\")]"
+[(73,"")]
+[(111,"")]
+[(273,"")]
+[]
+[]
+[]
+[(212,"8784372843778438743")]
+[(3248784372843778438743,"")]
+[(60788519836879239998834499,"")]

diff --git a/ghc/tests/numeric/should_run/num008.stdout b/ghc/tests/numeric/should_run/num008.stdout
new file mode 100644 (file)
index 0000000..00074cb
--- /dev/null
+++ b/ghc/tests/numeric/should_run/num008.stdout
@@ -0,0 +1,12 @@
+1.8217369e-300
+1.8217369
+1.8217369e-300
+0.0000000e0
+0.0000000000e0
+2.3e0
+0.0e0
+3.0e0
+5.0e0
+([0],0)
+0.0000000
+0.0000000