From 24207d40e9cb56173de22d9a424975f0da0bc416 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 3 Oct 2008 20:42:09 +0000 Subject: extended AP with Ord and compar in 1.5 --- next-lib/src/finnish/ConjunctionFin.gf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'next-lib/src/finnish/ConjunctionFin.gf') diff --git a/next-lib/src/finnish/ConjunctionFin.gf b/next-lib/src/finnish/ConjunctionFin.gf index 94cea7f8c..8e7f7a3c8 100644 --- a/next-lib/src/finnish/ConjunctionFin.gf +++ b/next-lib/src/finnish/ConjunctionFin.gf @@ -14,7 +14,7 @@ concrete ConjunctionFin of Conjunction = isPron = False } ; - ConjAP conj ss = conjunctDistrTable2 Bool AForm conj ss ; + ConjAP conj ss = conjunctDistrTable2 Bool NForm conj ss ; -- These fun's are generated from the list cat's. @@ -24,13 +24,13 @@ concrete ConjunctionFin of Conjunction = ConsAdv = consrSS comma ; BaseNP x y = twoTable NPForm x y ** {a = conjAgr x.a y.a} ; ConsNP xs x = consrTable NPForm comma xs x ** {a = conjAgr xs.a x.a} ; - BaseAP x y = twoTable2 Bool AForm x y ; - ConsAP xs x = consrTable2 Bool AForm comma xs x ; + BaseAP x y = twoTable2 Bool NForm x y ; + ConsAP xs x = consrTable2 Bool NForm comma xs x ; lincat [S] = {s1,s2 : Str} ; [Adv] = {s1,s2 : Str} ; [NP] = {s1,s2 : NPForm => Str ; a : Agr} ; - [AP] = {s1,s2 : Bool => AForm => Str} ; + [AP] = {s1,s2 : Bool => NForm => Str} ; } -- cgit v1.2.3