diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-08-05 15:33:21 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-08-05 15:33:21 +0100 |
| commit | b1b2433eb1d5440c4c11378299c9e7e4e22b9add (patch) | |
| tree | e466d0b130ff384a98d440dfdb03d1f7061f510b | |
| parent | 39828a2dc4e2755361d608b3d11b9fad2dca023b (diff) | |
| download | haskell-b1b2433eb1d5440c4c11378299c9e7e4e22b9add.tar.gz | |
Accept error message changes
When printing TH code we see the (nicely numbered)
uniques on fresh names. A consequence of the fix
to #5379
| -rw-r--r-- | testsuite/tests/th/T3572.stdout | 2 | ||||
| -rw-r--r-- | testsuite/tests/th/T3920.stdout | 4 | ||||
| -rw-r--r-- | testsuite/tests/th/T5037.stderr | 6 | ||||
| -rw-r--r-- | testsuite/tests/th/TH_ppr1.stdout | 28 | ||||
| -rw-r--r-- | testsuite/tests/th/TH_repGuard.stderr | 14 | ||||
| -rw-r--r-- | testsuite/tests/th/TH_viewPatPrint.stdout | 4 |
6 files changed, 29 insertions, 29 deletions
diff --git a/testsuite/tests/th/T3572.stdout b/testsuite/tests/th/T3572.stdout index 8dd47a4c5a..9df7a449ff 100644 --- a/testsuite/tests/th/T3572.stdout +++ b/testsuite/tests/th/T3572.stdout @@ -1 +1 @@ -data Void +data Void_0
diff --git a/testsuite/tests/th/T3920.stdout b/testsuite/tests/th/T3920.stdout index 224efdfda9..ddc9748894 100644 --- a/testsuite/tests/th/T3920.stdout +++ b/testsuite/tests/th/T3920.stdout @@ -1,2 +1,2 @@ -type family T :: (* -> * -> * -> *) -> (* -> *) -> * -type family Main.S :: (* -> * -> * -> *) -> (* -> *) -> * +type family T_0 :: (* -> * -> * -> *) -> (* -> *) -> *
+type family Main.S :: (* -> * -> * -> *) -> (* -> *) -> *
diff --git a/testsuite/tests/th/T5037.stderr b/testsuite/tests/th/T5037.stderr index 987d7fd852..391368c93b 100644 --- a/testsuite/tests/th/T5037.stderr +++ b/testsuite/tests/th/T5037.stderr @@ -1,3 +1,3 @@ -f :: Data.Maybe.Maybe GHC.Types.Int -> GHC.Types.Int
-f (Data.Maybe.Nothing) = 3
-f (Data.Maybe.Just x_0) = x
+f_0 :: Data.Maybe.Maybe GHC.Types.Int -> GHC.Types.Int
+f_0 (Data.Maybe.Nothing) = 3
+f_0 (Data.Maybe.Just x_1) = x
diff --git a/testsuite/tests/th/TH_ppr1.stdout b/testsuite/tests/th/TH_ppr1.stdout index 291d0bf748..e969c176c3 100644 --- a/testsuite/tests/th/TH_ppr1.stdout +++ b/testsuite/tests/th/TH_ppr1.stdout @@ -1,14 +1,14 @@ -Main.f Main.u1 Main.u2 -Main.u1 `Main.f` Main.u2 -(Main..+.) Main.u1 Main.u2 -Main.u1 Main..+. Main.u2 -(GHC.Types.:) Main.u1 Main.u2 -Main.u1 GHC.Types.: Main.u2 -\((GHC.Types.:) x_0 xs_1) -> x_0 -\(x_0 GHC.Types.: xs_1) -> x_0 -class Foo a_0 b_1 - where foo :: a_0 -> b_1 -\x_0 -> (x_0, 1 `x_0` 2) -\(+_0) -> ((+_0), 1 +_0 2) -(Main.f, 1 `Main.f` 2) -((Main..+.), 1 Main..+. 2) +Main.f Main.u1 Main.u2
+Main.u1 `Main.f` Main.u2
+(Main..+.) Main.u1 Main.u2
+Main.u1 Main..+. Main.u2
+(GHC.Types.:) Main.u1 Main.u2
+Main.u1 GHC.Types.: Main.u2
+\((GHC.Types.:) x_0 xs_1) -> x_0
+\(x_0 GHC.Types.: xs_1) -> x_0
+class Foo_0 a_1 b_2
+ where foo_3 :: a_1 -> b_2
+\x_0 -> (x_0, 1 `x_0` 2)
+\(+_0) -> ((+_0), 1 +_0 2)
+(Main.f, 1 `Main.f` 2)
+((Main..+.), 1 Main..+. 2)
diff --git a/testsuite/tests/th/TH_repGuard.stderr b/testsuite/tests/th/TH_repGuard.stderr index 896793a113..c0a4dd7cba 100644 --- a/testsuite/tests/th/TH_repGuard.stderr +++ b/testsuite/tests/th/TH_repGuard.stderr @@ -1,7 +1,7 @@ -foo :: GHC.Types.Int -> GHC.Types.Int -foo x_0 | x_0 GHC.Classes.== 5 = 6 -foo x_1 = 7 -bar :: Data.Maybe.Maybe GHC.Types.Int -> GHC.Types.Int -bar x_0 | Data.Maybe.Just y_1 <- x_0 - = y_1 -bar _ = 9 +foo_0 :: GHC.Types.Int -> GHC.Types.Int
+foo_0 x_1 | x_1 GHC.Classes.== 5 = 6
+foo_0 x_2 = 7
+bar_0 :: Data.Maybe.Maybe GHC.Types.Int -> GHC.Types.Int
+bar_0 x_1 | Data.Maybe.Just y_2 <- x_1
+ = y_2
+bar_0 _ = 9
diff --git a/testsuite/tests/th/TH_viewPatPrint.stdout b/testsuite/tests/th/TH_viewPatPrint.stdout index f520b23008..a995dae563 100644 --- a/testsuite/tests/th/TH_viewPatPrint.stdout +++ b/testsuite/tests/th/TH_viewPatPrint.stdout @@ -1,2 +1,2 @@ -ViewP (VarE GHC.Base.id) (VarP x) -(GHC.Base.id -> x) +ViewP (VarE GHC.Base.id) (VarP x_0)
+(GHC.Base.id -> x_0)
|