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␍
+
+
+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␍
+
+
+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 TestOperTypes␍
-   circular definitions: A T␍
+
+
+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␍
+
+
+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:␍
-       type of PTrue␍
-      expected: Type␍
-      inferred: PBool␍
+
+
+checking module TestCnc
+   Happened in linearization type of S in TestCnc.gf, line 3:
+       type of PTrue
+      expected: Type
+      inferred: PBool

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

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

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:␍
-      No definition given to the operation␍
+
+
+checking module Res
+   Happened in operation my_oper in Res.gf, line 3:
+      No definition given to the operation

testsuite/compiler/renamer/funpatt.gfs.gold

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

testsuite/compiler/renamer/varpatt.gfs.gold

@@ -1,4 +1,4 @@
-1␍
-␍
-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␍
-   in category B in A.gf, line 4␍
+
+
+checking module A
+   Prod expected for function A instead of Type
+   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␍
-   in type of function f in B.gf, line 5␍
+
+
+checking module B
+   Prod expected for function S instead of Type
+   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}␍
-   in definition of function f in C.gf, line 6␍
+
+
+checking module C
+   {Int <> S}
+   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:␍
-      A function type is expected for a_Det instead of type Str␍
+
+
+checking module A
+   Happened in operation silly in A.gf, line 5:
+      A function type is expected for a_Det instead of type Str

testsuite/compiler/update/ArrityCheck.gfs.gold

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