From af5f12d67261ce4bafcdec44adba8b60cc01c95c Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 30 Apr 2010 19:27:53 +0000 Subject: upgrade the testsuite to work with GHC 6.12 --- .../compiler/check/cyclic/abs-types/test1.gfs.gold | 8 +-- .../compiler/check/cyclic/abs-types/test2.gfs.gold | 8 +-- .../compiler/check/cyclic/opers/test.gfs.gold | 16 ++--- .../compiler/check/cyclic/params/test.gfs.gold | 8 +-- .../compiler/check/lincat-types/test.gfs.gold | 14 ++-- testsuite/compiler/check/lins/lins.gfs.gold | 74 +++++++++++----------- .../compiler/check/oper-definition/test.gfs.gold | 10 +-- testsuite/compiler/renamer/funpatt.gfs.gold | 10 +-- testsuite/compiler/renamer/varpatt.gfs.gold | 8 +-- .../typecheck/abstract/LetInTypesAbs.gfs.gold | 2 +- .../compiler/typecheck/abstract/test_A.gfs.gold | 10 +-- .../compiler/typecheck/abstract/test_B.gfs.gold | 10 +-- .../compiler/typecheck/abstract/test_C.gfs.gold | 10 +-- .../compiler/typecheck/concrete/test_A.gfs.gold | 10 +-- testsuite/compiler/update/ArrityCheck.gfs.gold | 16 ++--- 15 files changed, 107 insertions(+), 107 deletions(-) (limited to 'testsuite/compiler') diff --git a/testsuite/compiler/check/cyclic/abs-types/test1.gfs.gold b/testsuite/compiler/check/cyclic/abs-types/test1.gfs.gold index b8bde0be7..9e241effb 100644 --- a/testsuite/compiler/check/cyclic/abs-types/test1.gfs.gold +++ b/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 diff --git a/testsuite/compiler/check/cyclic/abs-types/test2.gfs.gold b/testsuite/compiler/check/cyclic/abs-types/test2.gfs.gold index 4caf3ae2c..c52a5373d 100644 --- a/testsuite/compiler/check/cyclic/abs-types/test2.gfs.gold +++ 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 diff --git a/testsuite/compiler/check/cyclic/opers/test.gfs.gold b/testsuite/compiler/check/cyclic/opers/test.gfs.gold index f2a1e5c22..cc052494c 100644 --- a/testsuite/compiler/check/cyclic/opers/test.gfs.gold +++ b/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 diff --git a/testsuite/compiler/check/cyclic/params/test.gfs.gold b/testsuite/compiler/check/cyclic/params/test.gfs.gold index bcd6a118e..dea8440d1 100644 --- a/testsuite/compiler/check/cyclic/params/test.gfs.gold +++ b/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 diff --git a/testsuite/compiler/check/lincat-types/test.gfs.gold b/testsuite/compiler/check/lincat-types/test.gfs.gold index 9f19766e5..34aa5352c 100644 --- a/testsuite/compiler/check/lincat-types/test.gfs.gold +++ 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 diff --git a/testsuite/compiler/check/lins/lins.gfs.gold b/testsuite/compiler/check/lins/lins.gfs.gold index cdec8fbed..14b08a591 100644 --- a/testsuite/compiler/check/lins/lins.gfs.gold +++ b/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"] +} diff --git a/testsuite/compiler/check/oper-definition/test.gfs.gold b/testsuite/compiler/check/oper-definition/test.gfs.gold index cf2f7f5ec..6d1d6bc77 100644 --- a/testsuite/compiler/check/oper-definition/test.gfs.gold +++ b/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 diff --git a/testsuite/compiler/renamer/funpatt.gfs.gold b/testsuite/compiler/renamer/funpatt.gfs.gold index f96aabdb1..382428255 100644 --- a/testsuite/compiler/renamer/funpatt.gfs.gold +++ b/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 diff --git a/testsuite/compiler/renamer/varpatt.gfs.gold b/testsuite/compiler/renamer/varpatt.gfs.gold index 8d4409e5d..ad0a7854e 100644 --- a/testsuite/compiler/renamer/varpatt.gfs.gold +++ b/testsuite/compiler/renamer/varpatt.gfs.gold @@ -1,4 +1,4 @@ -1 - -1 - +1 + +1 + diff --git a/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs.gold b/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs.gold index 784f3fa8c..588b1643d 100644 --- a/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs.gold +++ b/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs.gold @@ -1 +1 @@ -fun f : (Int -> Int) -> Int -> Int +fun f : (Int -> Int) -> Int -> Int diff --git a/testsuite/compiler/typecheck/abstract/test_A.gfs.gold b/testsuite/compiler/typecheck/abstract/test_A.gfs.gold index 79c77eb84..19a217175 100644 --- a/testsuite/compiler/typecheck/abstract/test_A.gfs.gold +++ b/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 diff --git a/testsuite/compiler/typecheck/abstract/test_B.gfs.gold b/testsuite/compiler/typecheck/abstract/test_B.gfs.gold index 2e9ff8aaa..b2839881d 100644 --- a/testsuite/compiler/typecheck/abstract/test_B.gfs.gold +++ b/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 diff --git a/testsuite/compiler/typecheck/abstract/test_C.gfs.gold b/testsuite/compiler/typecheck/abstract/test_C.gfs.gold index 0bfb204a3..dd15dab89 100644 --- a/testsuite/compiler/typecheck/abstract/test_C.gfs.gold +++ b/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 diff --git a/testsuite/compiler/typecheck/concrete/test_A.gfs.gold b/testsuite/compiler/typecheck/concrete/test_A.gfs.gold index f35da4b18..4f8d307aa 100644 --- a/testsuite/compiler/typecheck/concrete/test_A.gfs.gold +++ b/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 diff --git a/testsuite/compiler/update/ArrityCheck.gfs.gold b/testsuite/compiler/update/ArrityCheck.gfs.gold index 3f0cb2a78..28f98f445 100644 --- a/testsuite/compiler/update/ArrityCheck.gfs.gold +++ b/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 -- cgit v1.2.3