summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2013-11-22 16:40:36 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2013-11-22 16:42:57 +0000
commite4e7aff02ecf0a65853167142adefe31e539402e (patch)
treed9326cc9a4921b8a2c543f3e927ff363331dd12e
parentea73ef74a8e2a3c99120c974aae86eb91f15d9f9 (diff)
downloadhaskell-e4e7aff02ecf0a65853167142adefe31e539402e.tar.gz
Error message improvements
-rw-r--r--testsuite/tests/annotations/should_fail/annfail01.stderr8
-rw-r--r--testsuite/tests/annotations/should_fail/annfail02.stderr8
-rw-r--r--testsuite/tests/annotations/should_fail/annfail03.stderr5
-rw-r--r--testsuite/tests/annotations/should_fail/annfail11.stderr10
4 files changed, 22 insertions, 9 deletions
diff --git a/testsuite/tests/annotations/should_fail/annfail01.stderr b/testsuite/tests/annotations/should_fail/annfail01.stderr
index 160575cf92..6cafc25490 100644
--- a/testsuite/tests/annotations/should_fail/annfail01.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail01.stderr
@@ -1,4 +1,8 @@
-annfail01.hs:4:1: Not in scope: type constructor or class ‛Foo’
+annfail01.hs:4:1:
+ Not in scope: type constructor or class ‛Foo’
+ In the annotation: {-# ANN type Foo (1 :: Int) #-}
-annfail01.hs:5:1: Not in scope: ‛f’
+annfail01.hs:5:1:
+ Not in scope: ‛f’
+ In the annotation: {-# ANN f (1 :: Int) #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail02.stderr b/testsuite/tests/annotations/should_fail/annfail02.stderr
index 21f7aff821..84c954883a 100644
--- a/testsuite/tests/annotations/should_fail/annfail02.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail02.stderr
@@ -1,4 +1,8 @@
-annfail02.hs:6:1: Not in scope: data constructor ‛Foo’
+annfail02.hs:6:1:
+ Not in scope: data constructor ‛Foo’
+ In the annotation: {-# ANN Foo (1 :: Int) #-}
-annfail02.hs:7:1: Not in scope: type constructor or class ‛Bar’
+annfail02.hs:7:1:
+ Not in scope: type constructor or class ‛Bar’
+ In the annotation: {-# ANN type Bar (2 :: Int) #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail03.stderr b/testsuite/tests/annotations/should_fail/annfail03.stderr
index 3993fe852e..7e880d4d95 100644
--- a/testsuite/tests/annotations/should_fail/annfail03.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail03.stderr
@@ -1,7 +1,6 @@
-annfail03.hs:17:1:
+annfail03.hs:17:11:
GHC stage restriction:
- instance for ‛Data
- InModule’ is used in a top-level splice or annotation,
+ ‛InModule’ is used in a top-level splice or annotation,
and must be imported, not defined locally
In the annotation: {-# ANN f InModule #-}
diff --git a/testsuite/tests/annotations/should_fail/annfail11.stderr b/testsuite/tests/annotations/should_fail/annfail11.stderr
index 39ff0e82eb..3fa446f8e0 100644
--- a/testsuite/tests/annotations/should_fail/annfail11.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail11.stderr
@@ -1,4 +1,10 @@
-annfail11.hs:3:1: Not in scope: ‛length’
+annfail11.hs:3:1:
+ Not in scope: ‛length’
+ In the annotation:
+ {-# ANN length "Cannot annotate other modules yet" #-}
-annfail11.hs:4:1: Not in scope: type constructor or class ‛Integer’
+annfail11.hs:4:1:
+ Not in scope: type constructor or class ‛Integer’
+ In the annotation:
+ {-# ANN type Integer "Cannot annotate other modules yet" #-}