"Committed_by_peb"

2 files changed, 11 insertions, 9 deletions

diff --git a/grammars/ljung/variants/TestVars.gf b/grammars/ljung/variants/TestVars.gf
index 5341f12fe..53600c48c 100644
--- a/grammars/ljung/variants/TestVars.gf
+++ b/grammars/ljung/variants/TestVars.gf
@@ -1,14 +1,14 @@
 
 concrete TestVars of TestVarsA = open TestVarsR in {
 
-lincat S = { s : XYZ => Str; p : { s : Str; a : AB } };
+lincat S = {s1:Str; s2:AB => Str};
 
-lin a = { s = table { X _ => variants { "x1" ; "x2" };
-      	      	      Y   => variants { "y1" ; "y2" };
-		      _   => variants { "z1" ; "z2" } };
-          p = variants { { s = "s1" ; a = A } ;
-	      	       	 { s = "s2" ; a = B } };
-        };
+lin
 
-}
+f x = { s1 = x.s2 ! A;
+      	s2 = table{ y => variants{ x.s2 ! A; x.s1 ++ x.s2 ! y } } };
+
+a = { s1 = "a" ++ variants{ "b"; "c" }; 
+      s2 = table{ A => variants{ "A"; "Q" }; B => "B" } };
 
+}
diff --git a/grammars/ljung/variants/TestVarsA.gf b/grammars/ljung/variants/TestVarsA.gf
index 253af1320..a52804425 100644
--- a/grammars/ljung/variants/TestVarsA.gf
+++ b/grammars/ljung/variants/TestVarsA.gf
@@ -3,7 +3,9 @@ abstract TestVarsA = {
 
 cat S;
 
-fun a : S;
+fun 
+f : S -> S;
+a : S;
 
 }