summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Pedro Magalhaes <jpm@cs.uu.nl>2011-11-21 10:50:35 +0000
committerJose Pedro Magalhaes <jpm@cs.uu.nl>2011-11-21 14:57:56 +0000
commit42967bc491d5d8bdc625d20243f1b90efa3bdd65 (patch)
tree6296b13836c0e3ce27b380645c420aa101fa12b6
parent6f9490423393ec97c5fad4862c6d97f5ec92452d (diff)
downloadhaskell-42967bc491d5d8bdc625d20243f1b90efa3bdd65.tar.gz
Update outputs after renaming the ? and ?? kinds
-rw-r--r--testsuite/tests/gadt/gadt10.stderr2
-rw-r--r--testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/T3540.stderr10
-rw-r--r--testsuite/tests/typecheck/should_fail/T5573a.stderr8
-rw-r--r--testsuite/tests/typecheck/should_fail/T5573b.stderr14
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail028.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail057.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail087.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail110.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail115.stderr4
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail134.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail135.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail136.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail146.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail147.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail148.stderr2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail162.stderr2
17 files changed, 31 insertions, 31 deletions
diff --git a/testsuite/tests/gadt/gadt10.stderr b/testsuite/tests/gadt/gadt10.stderr
index 7858f51e8b..eab4721970 100644
--- a/testsuite/tests/gadt/gadt10.stderr
+++ b/testsuite/tests/gadt/gadt10.stderr
@@ -1,7 +1,7 @@
gadt10.hs:6:24:
`RInt' is not applied to enough type arguments
- Expected kind `??', but `RInt' has kind `k0 -> *'
+ Expected kind `ArgKind', but `RInt' has kind `k0 -> *'
In the type `RInt'
In the definition of data constructor `R'
In the data type declaration for `RInt'
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr
index b001e553a6..3cd05947b6 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr
@@ -1,7 +1,7 @@
SimpleFail14.hs:5:15:
Predicate `a ~ a' used as a type
- Expected kind `??', but `a ~ a' has kind `Constraint'
+ Expected kind `ArgKind', but `a ~ a' has kind `Constraint'
In the type `a ~ a'
In the definition of data constructor `T'
In the data type declaration for `T'
diff --git a/testsuite/tests/typecheck/should_fail/T3540.stderr b/testsuite/tests/typecheck/should_fail/T3540.stderr
index fb711cd5a1..e61109c224 100644
--- a/testsuite/tests/typecheck/should_fail/T3540.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3540.stderr
@@ -1,25 +1,25 @@
T3540.hs:4:12:
Predicate `a ~ Int' used as a type
- Expected kind `??', but `a ~ Int' has kind `Constraint'
+ Expected kind `ArgKind', but `a ~ Int' has kind `Constraint'
In the type signature for `thing': thing :: a ~ Int
T3540.hs:7:20:
Predicate `a ~ Int' used as a type
- Expected kind `?', but `a ~ Int' has kind `Constraint'
+ Expected kind `OpenKind', but `a ~ Int' has kind `Constraint'
In the type signature for `thing1': thing1 :: Int -> (a ~ Int)
T3540.hs:10:13:
Predicate `a ~ Int' used as a type
- Expected kind `??', but `a ~ Int' has kind `Constraint'
+ Expected kind `ArgKind', but `a ~ Int' has kind `Constraint'
In the type signature for `thing2': thing2 :: (a ~ Int) -> Int
T3540.hs:13:12:
Predicate `?dude :: Int' used as a type
- Expected kind `??', but `?dude :: Int' has kind `Constraint'
+ Expected kind `ArgKind', but `?dude :: Int' has kind `Constraint'
In the type signature for `thing3': thing3 :: (?dude :: Int) -> Int
T3540.hs:16:11:
Predicate `Eq a' used as a type
- Expected kind `??', but `Eq a' has kind `Constraint'
+ Expected kind `ArgKind', but `Eq a' has kind `Constraint'
In the type signature for `thing4': thing4 :: (Eq a) -> Int
diff --git a/testsuite/tests/typecheck/should_fail/T5573a.stderr b/testsuite/tests/typecheck/should_fail/T5573a.stderr
index f11c123951..7c599cc047 100644
--- a/testsuite/tests/typecheck/should_fail/T5573a.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5573a.stderr
@@ -1,16 +1,16 @@
T5573a.hs:11:16:
- Couldn't match kind `??' against `(#)'
+ Couldn't match kind `ArgKind' against `(#)'
Kind incompatibility when matching types:
- t0 :: ??
+ t0 :: ArgKind
(# t1, t2 #) :: (#)
In the expression: (# True, False #)
In the expression: (# x, (# True, False #) #)
T5573a.hs:14:6:
- Couldn't match kind `??' against `(#)'
+ Couldn't match kind `ArgKind' against `(#)'
Kind incompatibility when matching types:
- t0 :: ??
+ t0 :: ArgKind
(# t1, t2 #) :: (#)
In the pattern: (# x, y #)
In an equation for `foo3': foo3 (# x, y #) = x
diff --git a/testsuite/tests/typecheck/should_fail/T5573b.stderr b/testsuite/tests/typecheck/should_fail/T5573b.stderr
index 8cc09c266a..b2cbf6d0eb 100644
--- a/testsuite/tests/typecheck/should_fail/T5573b.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5573b.stderr
@@ -1,7 +1,7 @@
-
-T5573b.hs:6:22:
- Kind mis-match
- The first argument of an unboxed tuple should have kind `??',
- but `(# Double#, Double# #)' has kind `(#)'
- In the type signature for `foo':
- foo :: Double# -> (# (# Double#, Double# #), Double# #)
+
+T5573b.hs:6:22:
+ Kind mis-match
+ The first argument of an unboxed tuple should have kind `ArgKind',
+ but `(# Double#, Double# #)' has kind `(#)'
+ In the type signature for `foo':
+ foo :: Double# -> (# (# Double#, Double# #), Double# #)
diff --git a/testsuite/tests/typecheck/should_fail/tcfail028.stderr b/testsuite/tests/typecheck/should_fail/tcfail028.stderr
index e6d06db31d..35dc597f5a 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail028.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail028.stderr
@@ -1,7 +1,7 @@
tcfail028.hs:4:17:
`A a' is not applied to enough type arguments
- Expected kind `??', but `A a' has kind `k0 -> *'
+ Expected kind `ArgKind', but `A a' has kind `k0 -> *'
In the type `A a'
In the definition of data constructor `B'
In the data type declaration for `A'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail057.stderr b/testsuite/tests/typecheck/should_fail/tcfail057.stderr
index 4c815b6bb1..ffdabd33fd 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail057.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail057.stderr
@@ -1,5 +1,5 @@
tcfail057.hs:5:7:
Predicate `RealFrac a' used as a type
- Expected kind `??', but `RealFrac a' has kind `Constraint'
+ Expected kind `ArgKind', but `RealFrac a' has kind `Constraint'
In the type signature for `f': f :: (RealFrac a) -> a -> a
diff --git a/testsuite/tests/typecheck/should_fail/tcfail087.stderr b/testsuite/tests/typecheck/should_fail/tcfail087.stderr
index b9e9d2fa6a..bd85f732ea 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail087.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail087.stderr
@@ -1,7 +1,7 @@
tcfail087.hs:6:14:
Kind mis-match
- Expected kind `??', but `(# Int, Int #)' has kind `(#)'
+ Expected kind `ArgKind', but `(# Int, Int #)' has kind `(#)'
In the type `(# Int, Int #)'
In the definition of data constructor `Ex'
In the data type declaration for `Ex'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail110.stderr b/testsuite/tests/typecheck/should_fail/tcfail110.stderr
index 9e001cb44e..6c72045683 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail110.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail110.stderr
@@ -1,6 +1,6 @@
tcfail110.hs:8:30:
`Foo a' is not applied to enough type arguments
- Expected kind `??', but `Foo a' has kind `* -> *'
+ Expected kind `ArgKind', but `Foo a' has kind `* -> *'
In the type signature for `bar':
bar :: String -> (forall a. Foo a) -> IO ()
diff --git a/testsuite/tests/typecheck/should_fail/tcfail115.stderr b/testsuite/tests/typecheck/should_fail/tcfail115.stderr
index 00352afd9e..89f5178c87 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail115.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail115.stderr
@@ -1,8 +1,8 @@
tcfail115.hs:9:24:
- Couldn't match kind `??' against `(#)'
+ Couldn't match kind `ArgKind' against `(#)'
Kind incompatibility when matching types:
- t0 :: ??
+ t0 :: ArgKind
(# Int, Int #) :: (#)
In the expression: (r :: (# Int, Int #))
In a case alternative: r -> (r :: (# Int, Int #))
diff --git a/testsuite/tests/typecheck/should_fail/tcfail134.stderr b/testsuite/tests/typecheck/should_fail/tcfail134.stderr
index ef8b8b1511..c7f26105b3 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail134.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail134.stderr
@@ -1,6 +1,6 @@
tcfail134.hs:5:33:
`XML' is not applied to enough type arguments
- Expected kind `?', but `XML' has kind `* -> Constraint'
+ Expected kind `OpenKind', but `XML' has kind `* -> Constraint'
In the type `a -> XML'
In the class declaration for `XML'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail135.stderr b/testsuite/tests/typecheck/should_fail/tcfail135.stderr
index 37274283ed..741343f2ac 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail135.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail135.stderr
@@ -1,6 +1,6 @@
tcfail135.hs:6:23:
`f' is not applied to enough type arguments
- Expected kind `?', but `f' has kind `k0 -> *'
+ Expected kind `OpenKind', but `f' has kind `k0 -> *'
In the type `f a -> f'
In the class declaration for `Foo'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail136.stderr b/testsuite/tests/typecheck/should_fail/tcfail136.stderr
index 229cd1ff41..d91d2e302f 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail136.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail136.stderr
@@ -1,7 +1,7 @@
tcfail136.hs:9:35:
`SymDict' is not applied to enough type arguments
- Expected kind `??', but `SymDict' has kind `* -> *'
+ Expected kind `ArgKind', but `SymDict' has kind `* -> *'
In the type `SymDict'
In the definition of data constructor `SymTable'
In the data type declaration for `SymTable'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail146.stderr b/testsuite/tests/typecheck/should_fail/tcfail146.stderr
index e66dc94a76..6fc43358a9 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail146.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail146.stderr
@@ -1,7 +1,7 @@
tcfail146.hs:7:22:
Predicate `SClass a' used as a type
- Expected kind `??', but `SClass a' has kind `Constraint'
+ Expected kind `ArgKind', but `SClass a' has kind `Constraint'
In the type `SClass a'
In the definition of data constructor `SCon'
In the data type declaration for `SData'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail147.stderr b/testsuite/tests/typecheck/should_fail/tcfail147.stderr
index 51c32ad8a2..a485422a65 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail147.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail147.stderr
@@ -1,7 +1,7 @@
tcfail147.hs:7:19:
`XClass' is not applied to enough type arguments
- Expected kind `??', but `XClass' has kind `k0 -> Constraint'
+ Expected kind `ArgKind', but `XClass' has kind `k0 -> Constraint'
In the type `XClass'
In the definition of data constructor `XCon'
In the data type declaration for `XData'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail148.stderr b/testsuite/tests/typecheck/should_fail/tcfail148.stderr
index 670f440314..47111e9199 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail148.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail148.stderr
@@ -1,7 +1,7 @@
tcfail148.hs:5:28:
`List' is not applied to enough type arguments
- Expected kind `??', but `List' has kind `* -> *'
+ Expected kind `ArgKind', but `List' has kind `* -> *'
In the type `List'
In the definition of data constructor `Cons'
In the data type declaration for `List'
diff --git a/testsuite/tests/typecheck/should_fail/tcfail162.stderr b/testsuite/tests/typecheck/should_fail/tcfail162.stderr
index fcc1fb5665..f09bdf8835 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail162.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail162.stderr
@@ -1,7 +1,7 @@
tcfail162.hs:10:33:
`ForeignPtr' is not applied to enough type arguments
- Expected kind `??', but `ForeignPtr' has kind `* -> *'
+ Expected kind `ArgKind', but `ForeignPtr' has kind `* -> *'
In the type `{-# UNPACK #-} !ForeignPtr'
In the definition of data constructor `Foo'
In the data type declaration for `Foo'