added more functions in Extend

This commit is contained in:
Krasimir Angelov
2018-06-23 22:47:02 +02:00
parent 8cfc229164
commit 5f2d520e30
3 changed files with 43 additions and 4 deletions
+7 -1
View File
@@ -3,8 +3,9 @@ concrete ExtendSwe of Extend = CatSwe **
ExtendFunctor -
[
GenNP, GenModNP, ComplBareVS, CompBareCN,
ApposNP,
StrandRelSlash, EmptyRelSlash, StrandQuestSlash,
PassVPSlash, PassAgentVPSlash,
PassVPSlash, PassAgentVPSlash, UttVPShort,
MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV,
MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS,
ICompAP,
@@ -65,6 +66,8 @@ concrete ExtendSwe of Extend = CatSwe **
PassAgentVPSlash vps np =
insertObjPost (\\a => vps.c2.s ++ vps.n3 ! a) (insertObj (\\_ => (PrepNP by8agent_Prep np).s) (passiveVP vps)) ;
lin UttVPShort vp = {s = infVP vp (agrP3 Utr Sg)} ;
lincat
VPI = {s : VPIForm => Agr => Str} ;
[VPI] = {s1,s2 : VPIForm => Agr => Str} ;
@@ -152,6 +155,9 @@ concrete ExtendSwe of Extend = CatSwe **
Cons_rr_RNP x xs = consrTable Agr comma x xs ;
Cons_nr_RNP x xs = consrTable Agr comma {s = \\a => x.s ! NPAcc} xs ;
lin
ApposNP np1 np2 = {s = \\nform => np1.s ! nform ++ comma ++ np2.s ! nform; a = np1.a; isPron = False} ;
CompoundN n1 n2 = {
s = \\n,s,c => n1.co ++ BIND ++ n2.s ! n ! s ! c ;
co = n1.co ++ BIND ++ n2.co ;