[commit: testsuite] wip/nested-cpr: Update CPR output (different pretty printing for product types) (9e773d9)
git at git.haskell.org
git at git.haskell.org
Thu Dec 12 17:56:28 UTC 2013
Repository : ssh://git@git.haskell.org/testsuite
On branch : wip/nested-cpr
Link : http://ghc.haskell.org/trac/ghc/changeset/9e773d9f419847178ca2c4908ba8c6dbdbec6234/testsuite
>---------------------------------------------------------------
commit 9e773d9f419847178ca2c4908ba8c6dbdbec6234
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Tue Dec 10 11:55:56 2013 +0000
Update CPR output (different pretty printing for product types)
>---------------------------------------------------------------
9e773d9f419847178ca2c4908ba8c6dbdbec6234
tests/numeric/should_compile/T7116.stdout | 8 ++++----
tests/simplCore/should_compile/T3717.stderr | 2 +-
tests/simplCore/should_compile/T4201.stdout | 2 +-
tests/simplCore/should_compile/T4930.stderr | 2 +-
tests/simplCore/should_compile/T7360.stderr | 4 ++--
tests/simplCore/should_compile/spec-inline.stderr | 8 ++++----
tests/stranal/sigs/FacState.stderr | 2 +-
tests/stranal/sigs/HyperStrUse.stderr | 2 +-
tests/stranal/sigs/T8598.stderr | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/tests/numeric/should_compile/T7116.stdout b/tests/numeric/should_compile/T7116.stdout
index 79b4bf3..936ff9e 100644
--- a/tests/numeric/should_compile/T7116.stdout
+++ b/tests/numeric/should_compile/T7116.stdout
@@ -6,7 +6,7 @@ T7116.dl :: GHC.Types.Double -> GHC.Types.Double
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U(U)>tm1(d),
+ Str=DmdType <S,1*U(U)>tm(d),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
@@ -24,7 +24,7 @@ T7116.dr :: GHC.Types.Double -> GHC.Types.Double
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U(U)>tm1(d),
+ Str=DmdType <S,1*U(U)>tm(d),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
@@ -38,7 +38,7 @@ T7116.fl :: GHC.Types.Float -> GHC.Types.Float
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U(U)>tm1(d),
+ Str=DmdType <S,1*U(U)>tm(d),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
@@ -56,7 +56,7 @@ T7116.fr :: GHC.Types.Float -> GHC.Types.Float
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U(U)>tm1(d),
+ Str=DmdType <S,1*U(U)>tm(d),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/T3717.stderr b/tests/simplCore/should_compile/T3717.stderr
index 753d081..50f9ed6 100644
--- a/tests/simplCore/should_compile/T3717.stderr
+++ b/tests/simplCore/should_compile/T3717.stderr
@@ -17,7 +17,7 @@ T3717.foo [InlPrag=INLINE[0]] :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S(S),1*U(1*U)>dm1(d),
+ Str=DmdType <S(S),1*U(1*U)>dm(d),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/T4201.stdout b/tests/simplCore/should_compile/T4201.stdout
index 622276d..201cfe7 100644
--- a/tests/simplCore/should_compile/T4201.stdout
+++ b/tests/simplCore/should_compile/T4201.stdout
@@ -1,3 +1,3 @@
- {- Arity: 1, HasNoCafRefs, Strictness: <S,1*U()>tm1(),
+ {- Arity: 1, HasNoCafRefs, Strictness: <S,1*U()>tm(),
Unfolding: InlineRule (0, True, True)
Eta.bof `cast` (Sym (Eta.NTCo:Foo[0]) ->_R <Eta.T>_R) -}
diff --git a/tests/simplCore/should_compile/T4930.stderr b/tests/simplCore/should_compile/T4930.stderr
index e9f2965..e38bdec 100644
--- a/tests/simplCore/should_compile/T4930.stderr
+++ b/tests/simplCore/should_compile/T4930.stderr
@@ -13,7 +13,7 @@ T4930.foo1 = GHC.Err.error @ GHC.Types.Int lvl
T4930.foo :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
- Str=DmdType <S,1*U(U)>dm1(d),
+ Str=DmdType <S,1*U(U)>dm(d),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/T7360.stderr b/tests/simplCore/should_compile/T7360.stderr
index 4828efc..4e4e387 100644
--- a/tests/simplCore/should_compile/T7360.stderr
+++ b/tests/simplCore/should_compile/T7360.stderr
@@ -37,7 +37,7 @@ T7360.fun4 = T7360.fun1 T7360.Foo1
T7360.fun3 :: GHC.Types.Int
[GblId,
Caf=NoCafRefs,
- Str=DmdType tm1(d),
+ Str=DmdType tm(d),
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=0, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [] 10 20}]
@@ -46,7 +46,7 @@ T7360.fun3 = GHC.Types.I# 0
T7360.fun2 :: forall a. [a] -> ((), GHC.Types.Int)
[GblId,
Arity=1,
- Str=DmdType <L,1*U>tm1(d,dm1(d)),
+ Str=DmdType <L,1*U>tm(d,dm(d)),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/spec-inline.stderr b/tests/simplCore/should_compile/spec-inline.stderr
index c0a7b58..4b46257 100644
--- a/tests/simplCore/should_compile/spec-inline.stderr
+++ b/tests/simplCore/should_compile/spec-inline.stderr
@@ -98,7 +98,7 @@ Roman.foo_go [InlPrag=INLINE[0]]
-> Data.Maybe.Maybe GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=2,
- Str=DmdType <S,1*U><S,1*U>dm1(d),
+ Str=DmdType <S,1*U><S,1*U>dm(d),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
@@ -113,7 +113,7 @@ Roman.foo_go =
Roman.foo2 :: GHC.Types.Int
[GblId,
Caf=NoCafRefs,
- Str=DmdType tm1(d),
+ Str=DmdType tm(d),
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=0, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [] 10 20}]
@@ -122,7 +122,7 @@ Roman.foo2 = GHC.Types.I# 6
Roman.foo1 :: Data.Maybe.Maybe GHC.Types.Int
[GblId,
Caf=NoCafRefs,
- Str=DmdType tm2(tm1(d)),
+ Str=DmdType tm2(d),
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=0, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [] 10 20}]
@@ -132,7 +132,7 @@ Roman.foo :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,1*U>dm1(d),
+ Str=DmdType <S,1*U>dm(d),
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/stranal/sigs/FacState.stderr b/tests/stranal/sigs/FacState.stderr
index 133ad6e..18a551d 100644
--- a/tests/stranal/sigs/FacState.stderr
+++ b/tests/stranal/sigs/FacState.stderr
@@ -1,5 +1,5 @@
==================== Strictness signatures ====================
-FacState.fac: <S,1*U(U)><L,U>dm1(d,tm1(d))
+FacState.fac: <S,1*U(U)><L,U>dm(d,tm(d))
diff --git a/tests/stranal/sigs/HyperStrUse.stderr b/tests/stranal/sigs/HyperStrUse.stderr
index f102bb5..c6f02b1 100644
--- a/tests/stranal/sigs/HyperStrUse.stderr
+++ b/tests/stranal/sigs/HyperStrUse.stderr
@@ -1,5 +1,5 @@
==================== Strictness signatures ====================
-HyperStrUse.f: <S(SL),1*U(1*U(U),A)><S,1*U>dm1(d)
+HyperStrUse.f: <S(SL),1*U(1*U(U),A)><S,1*U>dm(d)
diff --git a/tests/stranal/sigs/T8598.stderr b/tests/stranal/sigs/T8598.stderr
index ec63d52..a59be7b 100644
--- a/tests/stranal/sigs/T8598.stderr
+++ b/tests/stranal/sigs/T8598.stderr
@@ -1,5 +1,5 @@
==================== Strictness signatures ====================
-T8598.fun: <S(S),1*U(U)>dm1(d)
+T8598.fun: <S(S),1*U(U)>dm(d)
More information about the ghc-commits
mailing list