added ConjRS and things needed for it

This commit is contained in:
aarne
2008-11-14 15:42:09 +00:00
parent e1662cd851
commit f2a5937120
6 changed files with 36 additions and 53 deletions

View File

@@ -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} ;
}