forked from GitHub/gf-rgl
Merge pull request #457 from EkaterinaVoloshina/master
added compoundPN and compoundLN
This commit is contained in:
@@ -175,18 +175,29 @@ lin
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
-- : VPSlash -> VP ; -- be forced to sleep
|
-- : VPSlash -> VP ; -- be forced to sleep
|
||||||
PassVPSlash vps = vps ** {
|
PassVPSlash vps = case vps.verb.asp of {
|
||||||
|
Perfective => vps ** {
|
||||||
verb=copulaEll ;
|
verb=copulaEll ;
|
||||||
compl=\\p,a => vps.compl ! p ! a ++ shortPastPassPart vps.verb (agrGenNum a) ++ vps.c.s
|
compl=\\p,a => shortPastPassPart vps.verb (agrGenNum a) ++ vps.compl ! p ! a ++ vps.c.s
|
||||||
} ;
|
} ;
|
||||||
|
Imperfective => vps ** {
|
||||||
|
verb=(passivate vps.verb);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
-- PresPartAP : VP -> AP ; -- (the man) looking at Mary
|
-- PresPartAP : VP -> AP ; -- (the man) looking at Mary
|
||||||
-- use PlP2 + "ый"
|
-- use PlP2 + "ый"
|
||||||
|
|
||||||
-- : VPSlash -> VP
|
-- : VPSlash -> VP
|
||||||
PassAgentVPSlash vps np =
|
PassAgentVPSlash vps np = case vps.verb.asp of {
|
||||||
vps ** {
|
Perfective => vps ** {
|
||||||
verb=copulaEll ;
|
verb=copulaEll ;
|
||||||
compl=\\p,a => vps.compl ! p ! a ++ shortPastPassPart vps.verb (agrGenNum a) ++ vps.c.s ++ np.s ! Ins
|
compl=\\p,a => shortPastPassPart vps.verb (agrGenNum a) ++ vps.c.s ++ vps.compl ! p ! a ++ np.s ! Ins
|
||||||
|
} ;
|
||||||
|
Imperfective => vps ** {
|
||||||
|
verb=(passivate vps.verb);
|
||||||
|
compl=\\p,a => vps.compl ! p ! a ++ np.s ! Ins
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -371,6 +371,17 @@ oper
|
|||||||
} ;
|
} ;
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|
||||||
|
compoundPN : (PN -> Str -> PN)
|
||||||
|
= \pn, adv -> pn ** {
|
||||||
|
s = \\c => pn.s ! c ++ adv
|
||||||
|
} ;
|
||||||
|
|
||||||
|
compoundLN : (LN -> Str -> LN)
|
||||||
|
= \ln, adv -> ln ** {
|
||||||
|
s = \\c => ln.s ! c ++ adv
|
||||||
|
} ;
|
||||||
|
|
||||||
mkN2 = overload {
|
mkN2 = overload {
|
||||||
mkN2 : N -> N2
|
mkN2 : N -> N2
|
||||||
= \n -> lin N2 (mkFun n nullPrep) ;
|
= \n -> lin N2 (mkFun n nullPrep) ;
|
||||||
|
|||||||
Reference in New Issue
Block a user