Rectified gold files

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

@@ -1,7 +1,9 @@
 
 
-testsuite/compiler/check/lincat-types/TestCnc.gf:3:
+testsuite/compiler/check/lincat-types/TestCnc.gf:
-  Happened in linearization type of S
+   testsuite/compiler/check/lincat-types/TestCnc.gf:3:
-    type of PTrue
+     Happened in linearization type of S
-   expected: Type
+       type of PTrue
-   inferred: PBool
+      expected: Type
+      inferred: Predef.PBool
+      

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

@@ -1,6 +1,3 @@
-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 ;
@@ -12,16 +9,23 @@ abstract lins {
 }
 concrete linsCnc {
   productions
-    C1 -> F2[]
+    C1 -> F4[]
   lindefs
-    C0 -> F0
+    C0 -> F0[CVar]
-    C1 -> F1
+    C1 -> F2[CVar]
+  linrefs
+    CVar -> F1[C0]
+    CVar -> F3[C1]
   lin
-    F0 := (S0) [lindef C]
+    F0 := (S2) ['lindef C']
-    F1 := () [lindef Nat]
+    F1 := (S1) ['lindef C']
-    F2 := () [zero]
+    F2 := () ['lindef Nat']
+    F3 := (S0) ['lindef Nat']
+    F4 := () [zero]
   sequences
-    S0 := {0,0}
+    S0 :=
+    S1 := <0,0>
+    S2 := {0,0}
   categories
     C := range  [C0 .. C0]
          labels ["s"]
@@ -33,7 +37,5 @@ concrete linsCnc {
            labels []
     String := range  [CString .. CString]
               labels ["s"]
-    __gfVar := range  [CVar .. CVar]
-               labels [""]
   printnames
 }

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

@@ -1,5 +1,6 @@
 
 
-testsuite/compiler/check/oper-definition/Res.gf:3:
+testsuite/compiler/check/oper-definition/Res.gf:
-  Happened in operation my_oper
+   testsuite/compiler/check/oper-definition/Res.gf:3:
-   No definition given to the operation
+     Happened in operation my_oper
+      No definition given to the operation

testsuite/compiler/check/strMatch/strMatch.gfs.gold

@@ -0,0 +1 @@
+

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

@@ -0,0 +1,15 @@
+fun f : Int -> Int ;
+def f n = ? ;
+000 CHECK_ARGS  1
+    ALLOC       2
+    PUT_CLOSURE 001
+    SET_PAD
+    TUCK        hp(0) 1
+    EVAL        f tail(0)
+001 ALLOC       2
+    PUT_LIT     0
+    PUSH_FRAME
+    PUSH        hp(0)
+    EVAL        f update
+Probability: 1.0
+

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

@@ -1 +1,3 @@
-fun f : (Int -> Int) -> Int -> Int
+fun f : (Int -> Int) -> Int -> Int ;
+Probability: 1.0
+

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

@@ -1,5 +1,6 @@
 
 
-testsuite/compiler/typecheck/abstract/A.gf:4:
+testsuite/compiler/typecheck/abstract/A.gf:
-  Happened in the category B
+   testsuite/compiler/typecheck/abstract/A.gf:4:
-   Prod expected for function A instead of Type
+     Happened in the category B
+      Prod expected for function A instead of Type

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

@@ -1,5 +1,6 @@
 
 
-testsuite/compiler/typecheck/abstract/B.gf:5:
+testsuite/compiler/typecheck/abstract/B.gf:
-  Happened in the type of function f
+   testsuite/compiler/typecheck/abstract/B.gf:5:
-   Prod expected for function S instead of Type
+     Happened in the type of function f
+      Prod expected for function S instead of Type

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

@@ -1,5 +1,6 @@
 
 
-testsuite/compiler/typecheck/abstract/C.gf:6:
+testsuite/compiler/typecheck/abstract/C.gf:
-  Happened in the definition of function f
+   testsuite/compiler/typecheck/abstract/C.gf:6:
-   {Int <> S}
+     Happened in the definition of function f
+      {Int <> S}

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

@@ -1,5 +1,9 @@
 
 
-testsuite/compiler/typecheck/concrete/A.gf:5:
+testsuite/compiler/typecheck/concrete/A.gf:
-  Happened in operation silly
+   testsuite/compiler/typecheck/concrete/A.gf:5:
-   A function type is expected for a_Det instead of type Str
+     Happened in operation silly
+      A function type is expected for a_Det instead of type Str
+      
+   ** Maybe you gave too many arguments to a_Det 
+

testsuite/runtime/linearize/brackets.gfs.gold

@@ -1,28 +1,19 @@
 (S:2 (E:1 (_:0 ?1)) is even)
 
-
 (S:3 exists x such that (S:2 (E:1 (_:0 x)) is even))
 
-
 (S:1 (E:0 a))
 
-
 (S:1 (E:0 aa) a)
 
-
 (S:1 (E:0 a) b)
 
-
 (S:1 (String:0 abcd) is string)
 
-
 (S:1 (Int:0 100) is integer)
 
-
 (S:1 (Float:0 12.4) is float)
 
-
 (S:1 (String:0 xyz) is string)
 
-
+ cannot linearize
-cannot linearize

testsuite/runtime/linearize/linearize.gfs.gold

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

testsuite/runtime/typecheck/hard-unification.gfs.gold

@@ -4,3 +4,5 @@ Probability: 1.0
 
 Meta variable(s) ?2 should be resolved
 in the expression: s ?2 (app ?2) ?4
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands

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

@@ -15,6 +15,8 @@ Type:        Label {n1}
 Probability: 1.0
 
 {n1} is implicit argument but not implicit argument is expected here
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Expression:  <\{_1}, x -> x : ({m} : Node) -> (n : Node) -> Node>
 Type:        ({m} : Node) -> (n : Node) -> Node
 Probability: 1.0

testsuite/runtime/typecheck/typecheck.gfs.gold

@@ -1,17 +1,31 @@
 Couldn't match expected type Nat
        against inferred type String
 In the expression: "0"
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Category Int should have 0 argument(s), but has been given 1
 In the type: Int 0
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 A function type is expected for the expression 1 instead of type Int
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Couldn't match expected type Int -> Int
        against inferred type Int
 In the expression: 1
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 unknown category of function identifier unknown_fun
 
 Category unknown_cat is not in scope
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Cannot infer the type of expression \x -> x
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 A function type is expected for the expression \x -> x instead of type Int
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Expression:  append (succ (succ zero)) (succ zero) (vector (succ (succ zero))) (vector (succ zero))
 Type:        Vector (succ (succ (succ zero)))
 Probability: 3.532127097800926e-8
@@ -31,6 +45,8 @@ Probability: 0.125
 Couldn't match expected type Morph (\v0 -> v0)
        against inferred type Morph (\v0 -> succ zero)
 In the expression: mkMorph (\x -> succ zero)
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Expression:  <append zero (succ zero) : Vector zero -> Vector (succ zero) -> Vector (succ zero)>
 Type:        Vector zero -> Vector (succ zero) -> Vector (succ zero)
 Probability: 1.0
@@ -40,6 +56,8 @@ Type:        (n : Nat) -> Vector n -> (m : Nat) -> Vector m -> Vector (plus n m)
 Probability: 1.0
 
 Category EQ is not in scope
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Expression:  <\v1, v2 -> cmpVector ?7 v1 v2 : Vector ?7 -> Vector ?7 -> Int> (vector ?7)
 Type:        Vector ?7 -> Int
 Probability: 0.3333333333333333
@@ -47,6 +65,8 @@ Probability: 0.3333333333333333
 Couldn't match expected type (m : Nat) -> Vector ?1
        against inferred type (n : Nat) -> Vector n
 In the expression: vector
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Expression:  f1 (\v -> v) vector
 Type:        Int
 Probability: 5.555555555555555e-2
@@ -58,9 +78,13 @@ Probability: 0.16666666666666666
 Couldn't match expected type Vector x
        against inferred type Vector (succ x)
 In the expression: vector (succ x)
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Couldn't match expected type Vector n
        against inferred type Vector (succ n)
 In the expression: vector (succ n)
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Expression:  h ?2 (u0 ?2)
 Type:        Int
 Probability: 8.333333333333333e-2
@@ -68,8 +92,12 @@ Probability: 8.333333333333333e-2
 Couldn't match expected type U ?2 ?2
        against inferred type U ?2 (succ ?2)
 In the expression: u1 ?2
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 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)))
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 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))
 Probability: 2.1558392930913853e-12
@@ -77,6 +105,8 @@ Probability: 2.1558392930913853e-12
 Couldn't match expected type Vector (plus (succ (succ (succ zero))) (succ (succ zero)))
        against inferred type Vector (succ (succ (succ (succ zero))))
 In the expression: vector (succ (succ (succ (succ zero))))
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands
 Expression:  idMorph (mkMorph2 (\x -> x) (vector zero))
 Type:        Nat
 Probability: 1.0416666666666666e-2
@@ -84,3 +114,5 @@ Probability: 1.0416666666666666e-2
 Couldn't match expected type Vector zero
        against inferred type Vector n
 In the expression: x
+CallStack (from HasCallStack):
+  error, called at src/compiler/GF/Command/Commands.hs:744:43 in gf-3.10.4-EdD6fabQUzM4AhRenbxTb3:GF.Command.Commands