From f2a5937120e4c9d0e633f252b50a008746422a07 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 14 Nov 2008 15:42:09 +0000 Subject: added ConjRS and things needed for it --- next-lib/src/finnish/ConjunctionFin.gf | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'next-lib/src/finnish') diff --git a/next-lib/src/finnish/ConjunctionFin.gf b/next-lib/src/finnish/ConjunctionFin.gf index 8e7f7a3c8..a11d9c596 100644 --- a/next-lib/src/finnish/ConjunctionFin.gf +++ b/next-lib/src/finnish/ConjunctionFin.gf @@ -16,6 +16,10 @@ concrete ConjunctionFin of Conjunction = ConjAP conj ss = conjunctDistrTable2 Bool NForm conj ss ; + ConjRS conj ss = conjunctDistrTable Agr conj ss ** { + c = ss.c + } ; + -- These fun's are generated from the list cat's. BaseS = twoSS ; @@ -26,11 +30,14 @@ concrete ConjunctionFin of Conjunction = ConsNP xs x = consrTable NPForm comma xs x ** {a = conjAgr xs.a x.a} ; BaseAP x y = twoTable2 Bool NForm x y ; ConsAP xs x = consrTable2 Bool NForm comma xs x ; + BaseRS x y = twoTable Agr x y ** {c = y.c} ; + ConsRS xs x = consrTable Agr comma xs x ** {c = xs.c} ; lincat [S] = {s1,s2 : Str} ; [Adv] = {s1,s2 : Str} ; [NP] = {s1,s2 : NPForm => Str ; a : Agr} ; [AP] = {s1,s2 : Bool => NForm => Str} ; + [RS] = {s1,s2 : Agr => Str ; c : NPForm} ; } -- cgit v1.2.3