diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-06-25 09:25:39 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-06-26 08:33:12 +0100 |
| commit | b98ff25f4c8cb4bf18b784c848fabaaa6e4b11b8 (patch) | |
| tree | 057dce79c8f2c77689cc2ed375c89858b38a4b4d /testsuite/tests/ghc-api | |
| parent | fb7b6922573af76a954d939c85e6af7c39a19896 (diff) | |
| download | haskell-b98ff25f4c8cb4bf18b784c848fabaaa6e4b11b8.tar.gz | |
Error message wibbles from out-of-scope changes
The patch "Treat out-of-scope variables as holes" makes
lots of error messages change a bit. This patch has all
the change.
Diffstat (limited to 'testsuite/tests/ghc-api')
| -rw-r--r-- | testsuite/tests/ghc-api/annotations/T10268.stderr | 18 | ||||
| -rw-r--r-- | testsuite/tests/ghc-api/annotations/T10278.stderr | 28 | ||||
| -rw-r--r-- | testsuite/tests/ghc-api/annotations/T10280.stderr | 14 | ||||
| -rw-r--r-- | testsuite/tests/ghc-api/annotations/T10312.stderr | 10 | ||||
| -rw-r--r-- | testsuite/tests/ghc-api/annotations/T10313.stderr | 54 | ||||
| -rw-r--r-- | testsuite/tests/ghc-api/annotations/T10357.stderr | 67 | ||||
| -rw-r--r-- | testsuite/tests/ghc-api/annotations/T10399.stderr | 20 |
7 files changed, 101 insertions, 110 deletions
diff --git a/testsuite/tests/ghc-api/annotations/T10268.stderr b/testsuite/tests/ghc-api/annotations/T10268.stderr index b4078fa981..cc879572a6 100644 --- a/testsuite/tests/ghc-api/annotations/T10268.stderr +++ b/testsuite/tests/ghc-api/annotations/T10268.stderr @@ -1,10 +1,8 @@ - -Test10268.hs:5:6: error: - Not in scope: ‘footemplate’ - In the untyped splice: $footemplate - -Test10268.hs:7:14: error: - Not in scope: type constructor or class ‘Pattern’ - -Test10268.hs:10:10: error: - Not in scope: type constructor or class ‘Pattern’ +
+Test10268.hs:5:6: error: Variable not in scope: footemplate :: ExpQ
+
+Test10268.hs:7:14: error:
+ Not in scope: type constructor or class ‘Pattern’
+
+Test10268.hs:10:10: error:
+ Not in scope: type constructor or class ‘Pattern’
diff --git a/testsuite/tests/ghc-api/annotations/T10278.stderr b/testsuite/tests/ghc-api/annotations/T10278.stderr index d3788b752d..6523039386 100644 --- a/testsuite/tests/ghc-api/annotations/T10278.stderr +++ b/testsuite/tests/ghc-api/annotations/T10278.stderr @@ -1,16 +1,12 @@ - -Test10278.hs:9:27: error: - Not in scope: type constructor or class ‘Tower’ - -Test10278.hs:9:39: error: - Not in scope: type constructor or class ‘Tower’ - -Test10278.hs:10:34: error: - Not in scope: type constructor or class ‘Tower’ - -Test10278.hs:10:46: error: - Not in scope: type constructor or class ‘Tower’ - -Test10278.hs:12:24: error: Not in scope: ‘zeroNewton’ - -Test10278.hs:12:36: error: Not in scope: ‘diffUU’ +
+Test10278.hs:9:27: error:
+ Not in scope: type constructor or class ‘Tower’
+
+Test10278.hs:9:39: error:
+ Not in scope: type constructor or class ‘Tower’
+
+Test10278.hs:10:34: error:
+ Not in scope: type constructor or class ‘Tower’
+
+Test10278.hs:10:46: error:
+ Not in scope: type constructor or class ‘Tower’
diff --git a/testsuite/tests/ghc-api/annotations/T10280.stderr b/testsuite/tests/ghc-api/annotations/T10280.stderr index 46d2c10f35..f2a2a56e63 100644 --- a/testsuite/tests/ghc-api/annotations/T10280.stderr +++ b/testsuite/tests/ghc-api/annotations/T10280.stderr @@ -1,6 +1,8 @@ - -Test10280.hs:4:8: error: Not in scope: ‘atomicModifyIORef’ - -Test10280.hs:4:26: error: Not in scope: ‘ciTokens’ - -Test10280.hs:4:44: error: Not in scope: ‘f’ +
+Test10280.hs:4:8: error:
+ Variable not in scope:
+ atomicModifyIORef :: t0 -> (a0 -> (b0, ())) -> t
+
+Test10280.hs:4:26: error: Variable not in scope: ciTokens
+
+Test10280.hs:4:44: error: Variable not in scope: f :: a0 -> b0
diff --git a/testsuite/tests/ghc-api/annotations/T10312.stderr b/testsuite/tests/ghc-api/annotations/T10312.stderr index 08f3bec6cf..8fc7a0c0bf 100644 --- a/testsuite/tests/ghc-api/annotations/T10312.stderr +++ b/testsuite/tests/ghc-api/annotations/T10312.stderr @@ -1,8 +1,2 @@ - -Test10312.hs:77:38: error: Not in scope: data constructor ‘Fixity’ - -Test10312.hs:77:53: error: - Not in scope: ‘fs’ - Perhaps you meant ‘fst’ (imported from Prelude) - -Test10312.hs:78:47: error: Not in scope: ‘ppDir’ +
+Test10312.hs:77:38: error: Not in scope: data constructor ‘Fixity’
diff --git a/testsuite/tests/ghc-api/annotations/T10313.stderr b/testsuite/tests/ghc-api/annotations/T10313.stderr index 321bfc52d7..1b6a7c2aab 100644 --- a/testsuite/tests/ghc-api/annotations/T10313.stderr +++ b/testsuite/tests/ghc-api/annotations/T10313.stderr @@ -1,29 +1,25 @@ - -Test10313.hs:9:13: error: - The deprecation for ‘solverCheckAndGetModel’ - lacks an accompanying binding - -Test10313.hs:15:16: error: - Multiple warning declarations for ‘Logic’ - also at Test10313.hs:9:13-17 - -Test10313.hs:15:16: error: - The deprecation for ‘solverCheckAndGetModel’ - lacks an accompanying binding - -Test10313.hs:16:13: error: - Multiple warning declarations for ‘solverCheckAndGetModel’ - also at Test10313.hs:10:13-34 - -Test10313.hs:30:15: error: - Not in scope: data constructor ‘Bitstream’ - -Test10313.hs:32:7: error: Not in scope: ‘S.concatMap’ - -Test10313.hs:32:19: error: Not in scope: ‘stream’ - -Test10313.hs:32:27: error: Not in scope: ‘GV.stream’ - -Test10313.hs:33:7: error: Not in scope: ‘S.sized’ - -Test10313.hs:34:7: error: Not in scope: data constructor ‘Exact’ +
+Test10313.hs:9:13: error:
+ The deprecation for ‘solverCheckAndGetModel’
+ lacks an accompanying binding
+
+Test10313.hs:15:16: error:
+ Multiple warning declarations for ‘Logic’
+ also at Test10313.hs:9:13-17
+
+Test10313.hs:15:16: error:
+ The deprecation for ‘solverCheckAndGetModel’
+ lacks an accompanying binding
+
+Test10313.hs:16:13: error:
+ Multiple warning declarations for ‘solverCheckAndGetModel’
+ also at Test10313.hs:10:13-34
+
+Test10313.hs:30:15: error:
+ Not in scope: data constructor ‘Bitstream’
+
+Test10313.hs:32:7: error: Not in scope: ‘S.concatMap’
+
+Test10313.hs:32:27: error: Not in scope: ‘GV.stream’
+
+Test10313.hs:33:7: error: Not in scope: ‘S.sized’
diff --git a/testsuite/tests/ghc-api/annotations/T10357.stderr b/testsuite/tests/ghc-api/annotations/T10357.stderr index a418490766..b394ffa49b 100644 --- a/testsuite/tests/ghc-api/annotations/T10357.stderr +++ b/testsuite/tests/ghc-api/annotations/T10357.stderr @@ -1,30 +1,37 @@ - -Test10357.hs:4:13: error: Not in scope: ‘one’ - -Test10357.hs:4:19: error: Not in scope: ‘x’ - -Test10357.hs:5:7: error: Not in scope: ‘multPoly’ - -Test10357.hs:6:10: error: Not in scope: ‘poly’ - -Test10357.hs:6:15: error: - Not in scope: data constructor ‘LE’ - Perhaps you meant ‘LT’ (imported from Prelude) - -Test10357.hs:7:10: error: Not in scope: ‘addPoly’ - -Test10357.hs:7:19: error: Not in scope: ‘poly’ - -Test10357.hs:7:24: error: - Not in scope: data constructor ‘LE’ - Perhaps you meant ‘LT’ (imported from Prelude) - -Test10357.hs:7:43: error: Not in scope: ‘multPoly’ - -Test10357.hs:8:19: error: Not in scope: ‘poly’ - -Test10357.hs:8:24: error: - Not in scope: data constructor ‘LE’ - Perhaps you meant ‘LT’ (imported from Prelude) - -Test10357.hs:8:43: error: Not in scope: ‘multPoly’ +
+Test10357.hs:4:13: error: Variable not in scope: one
+
+Test10357.hs:4:19: error: Variable not in scope: x
+
+Test10357.hs:5:7: error:
+ Variable not in scope: multPoly :: t3 -> t4 -> t
+
+Test10357.hs:6:10: error:
+ Variable not in scope: poly :: t0 -> [Double] -> t3
+
+Test10357.hs:6:15: error:
+ Data constructor not in scope: LE
+ Perhaps you meant ‘LT’ (imported from Prelude)
+
+Test10357.hs:7:10: error:
+ Variable not in scope: addPoly :: t5 -> t6 -> t4
+
+Test10357.hs:7:19: error:
+ Variable not in scope: poly :: t1 -> [Double] -> t7
+
+Test10357.hs:7:24: error:
+ Data constructor not in scope: LE
+ Perhaps you meant ‘LT’ (imported from Prelude)
+
+Test10357.hs:7:43: error:
+ Variable not in scope: multPoly :: t7 -> t -> t5
+
+Test10357.hs:8:19: error:
+ Variable not in scope: poly :: t2 -> [Double] -> t8
+
+Test10357.hs:8:24: error:
+ Data constructor not in scope: LE
+ Perhaps you meant ‘LT’ (imported from Prelude)
+
+Test10357.hs:8:43: error:
+ Variable not in scope: multPoly :: t8 -> t -> t6
diff --git a/testsuite/tests/ghc-api/annotations/T10399.stderr b/testsuite/tests/ghc-api/annotations/T10399.stderr index 71bc394b11..9d9bc29b0a 100644 --- a/testsuite/tests/ghc-api/annotations/T10399.stderr +++ b/testsuite/tests/ghc-api/annotations/T10399.stderr @@ -1,11 +1,9 @@ - -Test10399.hs:10:27: error: - Not in scope: type constructor or class ‘MPISecret’ - -Test10399.hs:12:10: error: Not in scope: ‘mkBila’ - -Test10399.hs:12:39: error: Not in scope: ‘P.base’ - -Test10399.hs:12:50: error: Not in scope: ‘P.pos’ - -Test10399.hs:12:60: error: Not in scope: ‘P.form’ +
+Test10399.hs:10:27: error:
+ Not in scope: type constructor or class ‘MPISecret’
+
+Test10399.hs:12:39: error: Not in scope: ‘P.base’
+
+Test10399.hs:12:50: error: Not in scope: ‘P.pos’
+
+Test10399.hs:12:60: error: Not in scope: ‘P.form’
|