Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/d26474349b295808f3a42460895e97ddafd36ba0 >--------------------------------------------------------------- commit d26474349b295808f3a42460895e97ddafd36ba0 Author: Ian Lynagh <[email protected]> Date: Fri Aug 26 21:39:12 2011 +0100 Follow ghc-prim changes >--------------------------------------------------------------- tests/ghci/scripts/ghci011.stdout | 2 +- tests/simplCore/should_compile/T3772.stdout | 4 ++-- tests/th/T3319.stderr | 2 +- tests/th/T5362.stderr | 4 ++-- tests/th/TH_foreignInterruptible.stderr | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/ghci/scripts/ghci011.stdout b/tests/ghci/scripts/ghci011.stdout index 840bb18..40666e0 100644 --- a/tests/ghci/scripts/ghci011.stdout +++ b/tests/ghci/scripts/ghci011.stdout @@ -5,7 +5,7 @@ instance Functor [] -- Defined in GHC.Base instance Ord a => Ord [a] -- Defined in GHC.Classes instance Read a => Read [a] -- Defined in GHC.Read instance Show a => Show [a] -- Defined in GHC.Show -data () = () -- Defined in GHC.Unit +data () = () -- Defined in GHC.Tuple instance Bounded () -- Defined in GHC.Enum instance Enum () -- Defined in GHC.Enum instance Eq () -- Defined in GHC.Classes diff --git a/tests/simplCore/should_compile/T3772.stdout b/tests/simplCore/should_compile/T3772.stdout index 343bfa3..eee8ce6 100644 --- a/tests/simplCore/should_compile/T3772.stdout +++ b/tests/simplCore/should_compile/T3772.stdout @@ -9,7 +9,7 @@ xs = \ (m :: GHC.Prim.Int#) -> case GHC.Prim.<=# m 1 of _ { GHC.Types.False -> xs (GHC.Prim.-# m 1); - GHC.Types.True -> GHC.Unit.() + GHC.Types.True -> GHC.Tuple.() } end Rec } @@ -20,7 +20,7 @@ T3772.foo = case n of _ { GHC.Types.I# n# -> case GHC.Prim.<=# n# 0 of _ { GHC.Types.False -> xs n#; - GHC.Types.True -> GHC.Unit.() + GHC.Types.True -> GHC.Tuple.() } } diff --git a/tests/th/T3319.stderr b/tests/th/T3319.stderr index 7947ce0..00b123d 100644 --- a/tests/th/T3319.stderr +++ b/tests/th/T3319.stderr @@ -5,4 +5,4 @@ T3319.hs:1:1: Splicing declarations CCall Unsafe "&" (mkName "foo") (AppT (ConT 'Ptr) (ConT '())))] ======> T3319.hs:8:3-93 - foreign import ccall unsafe "static &foo" foo :: Ptr GHC.Unit.() + foreign import ccall unsafe "static &foo" foo :: Ptr GHC.Tuple.() diff --git a/tests/th/T5362.stderr b/tests/th/T5362.stderr index 0c8c9bf..1979cc0 100644 --- a/tests/th/T5362.stderr +++ b/tests/th/T5362.stderr @@ -1,4 +1,4 @@ -f_0 :: GHC.Unit.() +f_0 :: GHC.Tuple.() f_0 = GHC.Err.undefined g_1 -g_1 :: GHC.Unit.() +g_1 :: GHC.Tuple.() g_1 = GHC.Err.undefined diff --git a/tests/th/TH_foreignInterruptible.stderr b/tests/th/TH_foreignInterruptible.stderr index b9aab05..39112c1 100644 --- a/tests/th/TH_foreignInterruptible.stderr +++ b/tests/th/TH_foreignInterruptible.stderr @@ -10,4 +10,4 @@ TH_foreignInterruptible.hs:1:1: Splicing declarations ======> TH_foreignInterruptible.hs:8:3-100 foreign import ccall interruptible "static &foo" foo - :: Ptr GHC.Unit.() + :: Ptr GHC.Tuple.() _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
