improving gfcc generation

1 files changed, 11 insertions, 17 deletions

diff --git a/src/GF/Canon/GFCC/Test.gf b/src/GF/Canon/GFCC/Test.gf
index 6700d90f3..5cd4c5474 100644
--- a/src/GF/Canon/GFCC/Test.gf
+++ b/src/GF/Canon/GFCC/Test.gf
@@ -1,11 +1,13 @@
 -- to test GFCC compilation
 
+flags coding=utf8 ;
+
 cat S ; NP ; N ; VP ;
 
 fun Pred : NP -> VP -> S ;
 fun Pred2 : NP -> VP -> NP -> S ;
 fun Det, Dets : N -> NP ;
-fun Mina, Te : NP ;
+fun Mina, Sina, Me, Te : NP ;
 fun Raha, Paska, Pallo : N ;
 fun Puhua, Munia, Sanoa : VP ;
 
@@ -22,24 +24,16 @@ lincat VP = Verb ;
 oper Noun = {s : NForm => Str} ;
 oper Verb = {s : VForm => Str} ;
 
-lincat NP = {s : Case => Str ; n : Number ; p : Person} ;
-lin Pred np vp = {s = np.s ! Nom ++ vp.s ! VF np.n np.p} ;
-lin Pred2 np vp ob = {s = np.s ! Nom ++ vp.s ! VF np.n np.p ++ ob.s ! Part} ;
-lin Det  no = {s = \\c => no.s ! NF Sg c ; n = Sg ; p = P3} ;
-lin Dets no = {s = \\c => no.s ! NF Pl c ; n = Pl ; p = P3} ;
-lin Mina = {s = table Case ["minä" ; "minua"] ; n = Sg ; p = P1} ;
-lin Te = {s = table Case ["te" ; "teitä"] ; n = Pl ; p = P2} ;
-
+lincat NP = {s : Case => Str ; a : {n : Number ; p : Person}} ;
 
--- for test
-cat NPR ;
-fun PredR : NPR -> VP -> S ;
-fun Sina, Me : NPR ;
-lincat NPR = {s : Case => Str ; a : {n : Number ; p : Person}} ;
-lin PredR np vp = {s = np.s ! Nom ++ vp.s ! VF np.a.n np.a.p} ;
+lin Pred np vp = {s = np.s ! Nom ++ vp.s ! VF np.a.n np.a.p} ;
+lin Pred2 np vp ob = {s = np.s ! Nom ++ vp.s ! VF np.a.n np.a.p ++ ob.s ! Part} ;
+lin Det  no = {s = \\c => no.s ! NF Sg c ; a = {n = Sg ; p = P3}} ;
+lin Dets no = {s = \\c => no.s ! NF Pl c ; a = {n = Pl ; p = P3}} ;
+lin Mina = {s = table Case ["minä" ; "minua"] ; a = {n = Sg ; p = P1}} ;
+lin Te   = {s = table Case ["te" ; "teitä"] ; a = {n = Pl ; p = P2}} ;
 lin Sina = {s = table Case ["sinä" ; "sinua"] ; a = {n = Sg ; p = P2}} ;
-lin Me = {s = table Case ["me" ; "meitä"] ; a = {n = Pl ; p = P1}} ;
--- end test
+lin Me   = {s = table Case ["me" ; "meitä"] ; a = {n = Pl ; p = P1}} ;
 
 lin Raha  = mkN "raha" ;
 lin Paska = mkN "paska" ;