summaryrefslogtreecommitdiff
path: root/next-lib/src/romance
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2008-11-14 15:42:09 +0000
committeraarne <aarne@cs.chalmers.se>2008-11-14 15:42:09 +0000
commitf2a5937120e4c9d0e633f252b50a008746422a07 (patch)
treeca516182be40a7b91ef075213889b350adca2f54 /next-lib/src/romance
parente1662cd85178cb287581fb93cf796edc8d02a48a (diff)
added ConjRS and things needed for it
Diffstat (limited to 'next-lib/src/romance')
-rw-r--r--next-lib/src/romance/ConjunctionRomance.gf6
1 files changed, 6 insertions, 0 deletions
diff --git a/next-lib/src/romance/ConjunctionRomance.gf b/next-lib/src/romance/ConjunctionRomance.gf
index 219ce5c58..521d2ed4b 100644
--- a/next-lib/src/romance/ConjunctionRomance.gf
+++ b/next-lib/src/romance/ConjunctionRomance.gf
@@ -16,6 +16,9 @@ incomplete concrete ConjunctionRomance of Conjunction =
ConjAP conj ss = conjunctDistrTable AForm conj ss ** {
isPre = ss.isPre
} ;
+ ConjRS conj ss = conjunctDistrTable2 Mood Agr conj ss ** {
+ c = ss.c
+ } ;
-- These fun's are generated from the list cat's.
@@ -36,11 +39,14 @@ incomplete concrete ConjunctionRomance of Conjunction =
} ;
BaseAP x y = twoTable AForm x y ** {isPre = andB x.isPre y.isPre} ;
ConsAP xs x = consrTable AForm comma xs x ** {isPre = andB xs.isPre x.isPre} ;
+ BaseRS x y = twoTable2 Mood Agr x y ** {c = y.c} ;
+ ConsRS xs x = consrTable2 Mood Agr comma xs x ** {c = xs.c} ;
lincat
[S] = {s1,s2 : Mood => Str} ;
[Adv] = {s1,s2 : Str} ;
[NP] = {s1,s2 : Case => Str ; a : Agr} ;
[AP] = {s1,s2 : AForm => Str ; isPre : Bool} ;
+ [RS] = {s1,s2 : Mood => Agr => Str ; c : Case} ;
}