diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-11-14 15:42:09 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-11-14 15:42:09 +0000 |
| commit | f2a5937120e4c9d0e633f252b50a008746422a07 (patch) | |
| tree | ca516182be40a7b91ef075213889b350adca2f54 /next-lib/src/scandinavian | |
| parent | e1662cd85178cb287581fb93cf796edc8d02a48a (diff) | |
added ConjRS and things needed for it
Diffstat (limited to 'next-lib/src/scandinavian')
| -rw-r--r-- | next-lib/src/scandinavian/ConjunctionScand.gf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/next-lib/src/scandinavian/ConjunctionScand.gf b/next-lib/src/scandinavian/ConjunctionScand.gf index b98f04ae9..6a85a74cb 100644 --- a/next-lib/src/scandinavian/ConjunctionScand.gf +++ b/next-lib/src/scandinavian/ConjunctionScand.gf @@ -17,6 +17,10 @@ incomplete concrete ConjunctionScand of Conjunction = isPre = ss.isPre } ; + ConjRS conj ss = conjunctDistrTable Agr conj ss ** { + c = ss.c + } ; + -- These fun's are generated from the list cat's. BaseS = twoTable Order ; @@ -27,11 +31,14 @@ incomplete concrete ConjunctionScand of Conjunction = ConsNP xs x = consrTable NPForm comma xs x ** {a = conjAgr xs.a x.a} ; BaseAP x y = twoTable AFormPos x y ** {isPre = andB x.isPre y.isPre} ; ConsAP xs x = consrTable AFormPos comma xs x ** {isPre = andB xs.isPre x.isPre} ; + 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 : Order => Str} ; [Adv] = {s1,s2 : Str} ; [NP] = {s1,s2 : NPForm => Str ; a : Agr} ; [AP] = {s1,s2 : AFormPos => Str ; isPre : Bool} ; + [RS] = {s1,s2 : Agr => Str ; c : NPForm} ; } |
