upgrade the testsuite to work with GHC 6.12

testsuite/compiler/check/cyclic/abs-types/test1.gfs.gold

@@ -1,4 +1,4 @@
-
+
-
+
-
+checking module Test1Abs
-
+   circular definitions: A B

testsuite/compiler/check/cyclic/abs-types/test2.gfs.gold

@@ -1,4 +1,4 @@
-
+
-
+
-
+checking module Test2Abs
-
+   circular definitions: f g

testsuite/compiler/check/cyclic/opers/test.gfs.gold

@@ -1,8 +1,8 @@
-
+
-
+
-
+checking module TestOpers
-
+   circular definitions: A B
-checking module TestOpers
+
-
+
-   circular definitions: A B
+checking module TestOperTypes
-
+   circular definitions: A T

testsuite/compiler/check/cyclic/params/test.gfs.gold

@@ -1,4 +1,4 @@
-
+
-
+
-
+checking module TestParams
-
+   circular definitions: A B

testsuite/compiler/check/lincat-types/test.gfs.gold

@@ -1,7 +1,7 @@
-
+
-
+
-
+checking module TestCnc
-
+   Happened in linearization type of S in TestCnc.gf, line 3:
-checking module TestCnc
+       type of PTrue
-
+      expected: Type
-   Happened in linearization type of S in TestCnc.gf, line 3:
+      inferred: PBool

testsuite/compiler/check/lins/lins.gfs.gold

@@ -1,37 +1,37 @@
-checking module linsCnc
+checking module linsCnc
-
+   Warning: no linearization type for C, inserting default {s : Str}
-   Warning: no linearization type for C, inserting default {s : Str}
+   Warning: no linearization of test
-
+abstract lins {
-   Warning: no linearization of test
+  cat C Nat
-
+  cat Float
-abstract lins {
+  cat Int
-
+  cat Nat
-  cat C Nat
+  cat String
-
+  fun test : C zero
-  cat Float
+  fun zero : Nat
-
+}
-  cat Int
+concrete linsCnc {
-
+  productions
-  cat Nat
+    C0 -> F0[CVar]
-
+    C1 -> F1[CVar]
-  cat String
+    C1 -> F2[]
-
+  functions
-  fun test : C zero
+    F0 := (S0) [__gfV]
-
+    F1 := () [__gfV]
-  fun zero : Nat
+    F2 := () [zero]
-
+  sequences
-}
+    S0 := <0,0>
-
+  categories
-concrete linsCnc {
+    C := range  [C0 .. C0]
-
+         labels ["s"]
-  productions
+    Float := range  [CFloat .. CFloat]
-
+             labels ["s"]
-    C0 -> F0[CVar]
+    Int := range  [CInt .. CInt]
-
+           labels ["s"]
-    C1 -> F1[CVar]
+    Nat := range  [C1 .. C1]
-
+           labels []
-    C1 -> F2[]
+    String := range  [CString .. CString]
-
+              labels ["s"]
-  functions
+    __gfVar := range  [CVar .. CVar]
-
+               labels ["s"]
-    F0 := (S0) [__gfV]
+}

testsuite/compiler/check/oper-definition/test.gfs.gold

@@ -1,5 +1,5 @@
-
+
-
+
-
+checking module Res
-
+   Happened in operation my_oper in Res.gf, line 3:
-checking module Res
+      No definition given to the operation

testsuite/compiler/renamer/funpatt.gfs.gold

@@ -1,5 +1,5 @@
-
+
-
+
-
+renaming module funpatt
-
+   renaming of d in funpatt.gf, line 11
-renaming module funpatt
+      data constructor expected but funpatt.D1 is found instead

testsuite/compiler/renamer/varpatt.gfs.gold

@@ -1,4 +1,4 @@
-1
+1
-
+
-
+1
-
+

testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs.gold

@@ -1 +1 @@
-fun f : (Int -> Int) -> Int -> Int
+fun f : (Int -> Int) -> Int -> Int

testsuite/compiler/typecheck/abstract/test_A.gfs.gold

@@ -1,5 +1,5 @@
-
+
-
+
-
+checking module A
-
+   Prod expected for function A instead of Type
-checking module A
+   in category B in A.gf, line 4

testsuite/compiler/typecheck/abstract/test_B.gfs.gold

@@ -1,5 +1,5 @@
-
+
-
+
-
+checking module B
-
+   Prod expected for function S instead of Type
-checking module B
+   in type of function f in B.gf, line 5

testsuite/compiler/typecheck/abstract/test_C.gfs.gold

@@ -1,5 +1,5 @@
-
+
-
+
-
+checking module C
-
+   {Int <> S}
-checking module C
+   in definition of function f in C.gf, line 6

testsuite/compiler/typecheck/concrete/test_A.gfs.gold

@@ -1,5 +1,5 @@
-
+
-
+
-
+checking module A
-
+   Happened in operation silly in A.gf, line 5:
-checking module A
+      A function type is expected for a_Det instead of type Str

testsuite/compiler/update/ArrityCheck.gfs.gold

@@ -1,8 +1,8 @@
-
+
-
+
-
+C:\gf\testsuite\compiler\update\ArrityCheck.gf:6:1: cannot unify the informations
-
+    fun f : Int -> Int -> Int ;
-C:\gf_3\testsuite\compiler\update\ArrityCheck.gf:6:1: cannot unify the informations
+    def f 0 = \x -> x ;
-
+and
-    fun f : Int -> Int -> Int ;
+    def f 1 1 = 0 ;
-
+in module ArrityCheck

testsuite/runtime/eval/eval.gfs.gold

@@ -1,64 +1,64 @@
-\x -> x 1
+\x -> x 1
-
+
-
+?1 1
-
+
-?1 1
+?3 1
-
+
-
+f 1 2
-
+
-?3 1
+\x -> x
-
+
-
+?1
-
+
-f 1 2
+f
-
+
-
+f 1 2
-
+
-\x -> x
+2
-
+
-
+g 0
-
+
-?1
+\x -> g x
-
+
-
+g ?1
-
+
-f
+5
-
+
-
+3
-
+
-f 1 2
+g2
-
+
-
+f 32
-
+
-2
+g2 23
-
+
-
+3.14
-
+
-g 0
+succ zero
-
+
-
+?1
-
+
-\x -> g x
+zeroF
-
+
-
+dec (succF zeroF)
-
+
-g ?1
+dec zeroF
-
+
-
+\x -> dec x
-
+
-5
+dec ?1
-
+
-
+g3 ?3 0
-
+
-3
+g (g2 ?1 0)
-
+
-
+succ (succ zero)
-
+
-g2
+zero
-
+
-
+dec2 0 err
-
+
-f 32
+succ err
-
+
-
+\x -> dec (dec x)
-
+

testsuite/runtime/eval/lazy.gfs.gold

@@ -1,2 +1,2 @@
-succ (succ (succ zero))
+succ (succ (succ zero))
-
+

testsuite/runtime/linearize/linearize.gfs.gold

@@ -1,30 +1,30 @@
-?1 is even
+?1 is even
-
+
-
+
-
+exists x such that x is even
-
+
-
+
-exists x such that x is even
+a
-
+
-
+
-
+aa a
-
+
-
+
-a
+a b
-
+
-
+
-
+abcd is string
-
+
-
+
-aa a
+100 is integer
-
+
-
+
-
+12.4 is float
-
+
-
+
-a b
+xyz is string
-
+
-
+
-
+
-
+
-
+

testsuite/runtime/paraphrase/lambda.gfs.gold

@@ -1,12 +1,12 @@
-\x -> x
+\x -> x
-
+
-
+1
-
+
-1
+\x -> x
-
+
-
+\x -> 2
-
+
-\x -> x
+1
-
+
-
+2
-
+

testsuite/runtime/typecheck/implicit-arguments.gfs.gold

@@ -1,22 +1,22 @@
-Expression: join {n1} {n2} {n3} l12 (link {n2} {n3} l23)
+Expression: join {n1} {n2} {n3} l12 (link {n2} {n3} l23)
-
+Type:       Path n1 n3
-Type:       Path n1 n3
+
-
+Expression: join {n1} {n2} {n3} l12 (link {n2} {n3} l23)
-
+Type:       Path n1 n3
-
+
-Expression: join {n1} {n2} {n3} l12 (link {n2} {n3} l23)
+Expression: <?2 : Label {?1}>
-
+Type:       Label {?1}
-Type:       Path n1 n3
+
-
+Expression: <?2 : Label {n1}>
-
+Type:       Label {n1}
-
+
-Expression: <?2 : Label {?1}>
+{n1} is implicit argument but not implicit argument is expected here
-
+Expression: <\{_1}, x -> x : ({m} : Node) -> (n : Node) -> Node>
-Type:       Label {?1}
+Type:       ({m} : Node) -> (n : Node) -> Node
-
+
-
+Expression: <\{_1} -> n1 : ({m} : Node) -> Node>
-
+Type:       ({m} : Node) -> Node
-Expression: <?2 : Label {n1}>
+
-
+Expression: <\{_1} -> ?1 : ({m} : Node) -> Node>
-Type:       Label {n1}
+Type:       ({m} : Node) -> Node
-
+

testsuite/runtime/typecheck/typecheck.gfs.gold

@@ -1,74 +1,74 @@
-Couldn't match expected type Nat
+Couldn't match expected type Nat
-
+       against inferred type String
-       against inferred type String
+In the expression: "0"
-
+Category Int should have 0 argument(s), but has been given 1
-In the expression: "0"
+In the type: Int 0
-
+A function type is expected for the expression 1 instead of type Int
-Category Int should have 0 argument(s), but has been given 1
+Couldn't match expected type Int -> Int
-
+       against inferred type Int
-In the type: Int 0
+In the expression: 1
-
+unknown category of function identifier unknown_fun
-A function type is expected for the expression 1 instead of type Int
+
-
+Category unknown_cat is not in scope
-Couldn't match expected type Int -> Int
+Cannot infer the type of expression \x -> x
-
+A function type is expected for the expression \x -> x instead of type Int
-       against inferred type Int
+Expression: append (succ (succ zero)) (succ zero) (vector (succ (succ zero))) (vector (succ zero))
-
+Type:       Vector (succ (succ (succ zero)))
-In the expression: 1
+
-
+Expression: <\m, n -> vector (plus m n) : (m : Nat) -> (n : Nat) -> Vector (plus m n)>
-unknown category of function identifier unknown_fun
+Type:       (m : Nat) -> (n : Nat) -> Vector (plus m n)
-
+
-
+Expression: mkMorph (\x -> succ zero)
-
+Type:       Morph (\x -> succ zero)
-Category unknown_cat is not in scope
+
-
+Expression: idMorph (mkMorph (\x -> x))
-Cannot infer the type of expression \x -> x
+Type:       Nat
-
+
-A function type is expected for the expression \x -> x instead of type Int
+Couldn't match expected type Morph (\x -> x)
-
+       against inferred type Morph (\x -> succ zero)
-Expression: append (succ (succ zero)) (succ zero) (vector (succ (succ zero))) (vector (succ zero))
+In the expression: mkMorph (\x -> succ zero)
-
+Expression: <append zero (succ zero) : Vector zero -> Vector (succ zero) -> Vector (succ zero)>
-Type:       Vector (succ (succ (succ zero)))
+Type:       Vector zero -> Vector (succ zero) -> Vector (succ zero)
-
+
-
+Expression: <\n, v1, n1, v2 -> append n n1 v1 v2 : (n : Nat) -> Vector n -> (m : Nat) -> Vector m -> Vector (plus n m)>
-
+Type:       (n : Nat) -> Vector n -> (m : Nat) -> Vector m -> Vector (plus n m)
-Expression: <\m, n -> vector (plus m n) : (m : Nat) -> (n : Nat) -> Vector (plus m n)>
+
-
+Category EQ is not in scope
-Type:       (m : Nat) -> (n : Nat) -> Vector (plus m n)
+Expression: <\v1, v2 -> cmpVector ?7 v1 v2 : Vector ?7 -> Vector ?7 -> Int> (vector ?7)
-
+Type:       Vector ?7 -> Int
-
+
-
+Couldn't match expected type (m : Nat) -> Vector ?1
-Expression: mkMorph (\x -> succ zero)
+       against inferred type (n : Nat) -> Vector n
-
+In the expression: vector
-Type:       Morph (\x -> succ zero)
+Expression: f1 (\v -> v) vector
-
+Type:       Int
-
+
-
+Expression: f1 (\v -> succ v) (\x -> vector (succ x))
-Expression: idMorph (mkMorph (\x -> x))
+Type:       Int
-
+
-Type:       Nat
+Couldn't match expected type Vector x
-
+       against inferred type Vector (succ x)
-
+In the expression: vector (succ x)
-
+Couldn't match expected type Vector n
-Couldn't match expected type Morph (\x -> x)
+       against inferred type Vector (succ n)
-
+In the expression: vector (succ n)
-       against inferred type Morph (\x -> succ zero)
+Expression: h ?2 (u0 ?2)
-
+Type:       Int
-In the expression: mkMorph (\x -> succ zero)
+
-
+Couldn't match expected type U ?2 ?2
-Expression: <append zero (succ zero) : Vector zero -> Vector (succ zero) -> Vector (succ zero)>
+       against inferred type U ?2 (succ ?2)
-
+In the expression: u1 ?2
-Type:       Vector zero -> Vector (succ zero) -> Vector (succ zero)
+Meta variable(s) ?11 should be resolved
-
+in the expression: cmpVector (succ (succ zero)) (vector (succ (succ zero))) (append ?11 (succ zero) (vector ?11) (vector (succ zero)))
-
+Expression: diff (succ (succ (succ zero))) (succ (succ zero)) (vector (succ (succ (succ (succ (succ zero)))))) (vector (succ (succ (succ zero))))
-
+Type:       Vector (succ (succ zero))
-Expression: <\n, v1, n1, v2 -> append n n1 v1 v2 : (n : Nat) -> Vector n -> (m : Nat) -> Vector m -> Vector (plus n m)>
+
-
+Couldn't match expected type Vector (plus (succ (succ (succ zero))) (succ (succ zero)))
-Type:       (n : Nat) -> Vector n -> (m : Nat) -> Vector m -> Vector (plus n m)
+       against inferred type Vector (succ (succ (succ (succ zero))))
-
+In the expression: vector (succ (succ (succ (succ zero))))
-
+Couldn't match expected type Vector ?1
-
+       against inferred type Vector zero
-Category EQ is not in scope
+In the expression: vector zero
-
+Couldn't match expected type Vector zero
-Expression: <\v1, v2 -> cmpVector ?7 v1 v2 : Vector ?7 -> Vector ?7 -> Int> (vector ?7)
+       against inferred type Vector n
-
+In the expression: x