From 902ff81773fc6eb63512fbb95fc8e3d5ead0e738 Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 25 Sep 2006 13:03:33 +0000 Subject: some fixes in gfcc compilation --- src/GF/Canon/GFCC/Test.gf | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/GF/Canon/GFCC/Test.gf') diff --git a/src/GF/Canon/GFCC/Test.gf b/src/GF/Canon/GFCC/Test.gf index 6cbbd367c..efb77eff6 100644 --- a/src/GF/Canon/GFCC/Test.gf +++ b/src/GF/Canon/GFCC/Test.gf @@ -24,6 +24,7 @@ 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} ; @@ -31,16 +32,19 @@ 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}} ; ---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}} ; +-- -} +{- +lincat NP = {s : Case => Str ; a : {n : Number ; p : Person}} ; +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 Raha = mkN "raha" ; +lin Raha = mkN "raha" ; lin Paska = mkN "paska" ; lin Pallo = mkN "pallo" ; lin Puhua = mkV "puhu" ; -- cgit v1.2.3