Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/18900175c14a8d79e16482211b83f07d835507d8 >--------------------------------------------------------------- commit 18900175c14a8d79e16482211b83f07d835507d8 Author: Simon Peyton Jones <[email protected]> Date: Wed Aug 3 09:05:41 2011 +0100 Unique-name wibbles in SpecConstr >--------------------------------------------------------------- tests/simplCore/should_compile/T4908.stderr | 10 +++--- tests/simplCore/should_compile/spec-inline.stderr | 32 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/simplCore/should_compile/T4908.stderr b/tests/simplCore/should_compile/T4908.stderr index 1654c2e..ac90d0f 100644 --- a/tests/simplCore/should_compile/T4908.stderr +++ b/tests/simplCore/should_compile/T4908.stderr @@ -11,10 +11,10 @@ T4908.f_$s$wf = \ (sc :: GHC.Prim.Int#) (sc1 :: GHC.Types.Int) (sc2 :: GHC.Prim.Int#) -> - case sc2 of ds { + case sc of ds { __DEFAULT -> - case sc of ds1 { - __DEFAULT -> T4908.f_$s$wf ds1 sc1 (GHC.Prim.-# ds 1); + case sc2 of ds1 { + __DEFAULT -> T4908.f_$s$wf (GHC.Prim.-# ds 1) sc1 ds1; 0 -> GHC.Types.True }; 0 -> GHC.Types.True @@ -38,7 +38,7 @@ T4908.$wf = case w of _ { (a, b) -> case b of _ { GHC.Types.I# ds1 -> case ds1 of ds2 { - __DEFAULT -> T4908.f_$s$wf ds2 a (GHC.Prim.-# ds 1); + __DEFAULT -> T4908.f_$s$wf (GHC.Prim.-# ds 1) a ds2; 0 -> GHC.Types.True } } @@ -69,7 +69,7 @@ T4908.f = forall (sc :: GHC.Prim.Int#) (sc1 :: GHC.Types.Int) (sc2 :: GHC.Prim.Int#). - T4908.$wf sc2 (sc1, GHC.Types.I# sc) + T4908.$wf sc (sc1, GHC.Types.I# sc2) = T4908.f_$s$wf sc sc1 sc2 diff --git a/tests/simplCore/should_compile/spec-inline.stderr b/tests/simplCore/should_compile/spec-inline.stderr index b8f8abc..eba8a4d 100644 --- a/tests/simplCore/should_compile/spec-inline.stderr +++ b/tests/simplCore/should_compile/spec-inline.stderr @@ -21,19 +21,19 @@ Roman.foo_$s$wgo = GHC.Prim.+# (GHC.Prim.+# (GHC.Prim.+# - (GHC.Prim.+# (GHC.Prim.+# (GHC.Prim.+# sc sc) sc) sc) sc) - sc) - sc } in - case GHC.Prim.<=# sc1 0 of _ { + (GHC.Prim.+# (GHC.Prim.+# (GHC.Prim.+# sc1 sc1) sc1) sc1) sc1) + sc1) + sc1 } in + case GHC.Prim.<=# sc 0 of _ { GHC.Types.False -> - case GHC.Prim.<# sc1 100 of _ { + case GHC.Prim.<# sc 100 of _ { GHC.Types.False -> - case GHC.Prim.<# sc1 500 of _ { + case GHC.Prim.<# sc 500 of _ { GHC.Types.False -> - Roman.foo_$s$wgo (GHC.Prim.+# a a) (GHC.Prim.-# sc1 1); - GHC.Types.True -> Roman.foo_$s$wgo a (GHC.Prim.-# sc1 3) + Roman.foo_$s$wgo (GHC.Prim.-# sc 1) (GHC.Prim.+# a a); + GHC.Types.True -> Roman.foo_$s$wgo (GHC.Prim.-# sc 3) a }; - GHC.Types.True -> Roman.foo_$s$wgo sc (GHC.Prim.-# sc1 2) + GHC.Types.True -> Roman.foo_$s$wgo (GHC.Prim.-# sc 2) sc1 }; GHC.Types.True -> 0 } @@ -69,7 +69,7 @@ Roman.$wgo = ipv) ipv } in case w of _ { - Data.Maybe.Nothing -> Roman.foo_$s$wgo a 10; + Data.Maybe.Nothing -> Roman.foo_$s$wgo 10 a; Data.Maybe.Just n -> case n of _ { GHC.Types.I# x2 -> case GHC.Prim.<=# x2 0 of _ { @@ -78,10 +78,10 @@ Roman.$wgo = GHC.Types.False -> case GHC.Prim.<# x2 500 of _ { GHC.Types.False -> - Roman.foo_$s$wgo (GHC.Prim.+# a a) (GHC.Prim.-# x2 1); - GHC.Types.True -> Roman.foo_$s$wgo a (GHC.Prim.-# x2 3) + Roman.foo_$s$wgo (GHC.Prim.-# x2 1) (GHC.Prim.+# a a); + GHC.Types.True -> Roman.foo_$s$wgo (GHC.Prim.-# x2 3) a }; - GHC.Types.True -> Roman.foo_$s$wgo ipv (GHC.Prim.-# x2 2) + GHC.Types.True -> Roman.foo_$s$wgo (GHC.Prim.-# x2 2) ipv }; GHC.Types.True -> 0 } @@ -140,15 +140,15 @@ Roman.foo :: GHC.Types.Int -> GHC.Types.Int Roman.foo = \ (n :: GHC.Types.Int) -> case n of _ { GHC.Types.I# ipv -> - case Roman.foo_$s$wgo 6 ipv of ww { __DEFAULT -> GHC.Types.I# ww } + case Roman.foo_$s$wgo ipv 6 of ww { __DEFAULT -> GHC.Types.I# ww } } ------ Local rules for imported ids -------- "SC:$wgo0" [ALWAYS] forall (sc :: GHC.Prim.Int#) (sc1 :: GHC.Prim.Int#). - Roman.$wgo (Data.Maybe.Just @ GHC.Types.Int (GHC.Types.I# sc1)) - (Data.Maybe.Just @ GHC.Types.Int (GHC.Types.I# sc)) + Roman.$wgo (Data.Maybe.Just @ GHC.Types.Int (GHC.Types.I# sc)) + (Data.Maybe.Just @ GHC.Types.Int (GHC.Types.I# sc1)) = Roman.foo_$s$wgo sc sc1 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
