Oridnal numerals added ; many fixes

This commit is contained in:
Roman Suzi
2020-08-08 20:30:28 +03:00
parent bbbe9bbb03
commit c0734bdfbb
25 changed files with 4061 additions and 425 deletions
+25 -14
View File
@@ -30,7 +30,7 @@ lin
} ;
-- : NP -> Cl ; -- there is a house
ExistNP np = {subj=np.s ! Nom ; compl="" ; verb=to_exist ; dep=[] ; adv=[] ; a=np.a} ; -- TODO: Different order?
ExistNP np = {subj=np.s ! Nom ; compl="" ; verb=to_exist ; dep=[] ; adv=[] ; a=np.a} ;
-- : IP -> QCl ; -- which houses are there
ExistIP ip = {
@@ -41,25 +41,36 @@ lin
compl=[];
a=ip.a
} ;
-- TODO: ExistNPAdv : NP -> Adv -> Cl ; -- there is a house in Paris
-- TODO: ExistIPAdv : IP -> Adv -> QCl ; -- which houses are there in Paris
-- : NP -> Adv -> Cl ; -- there is a house in Paris
ExistNPAdv np adv = {
subj=np.s ! Nom ;
compl="" ;
verb=to_exist ;
dep=[] ;
adv=adv.s ;
a=np.a
} ;
-- : IP -> Adv -> QCl ; -- which houses are there in Paris
ExistIPAdv ip adv = {
subj=ip.nom ; -- gen?
adv=adv.s ;
verb=to_exist;
dep=[] ;
compl=[];
a=ip.a
} ;
-- : VP -> VP ; -- be sleeping
ProgrVP vp = vp ;
-- : VP -> Utt ; -- let's go
ImpPl1 vp =
let a = Ag GPl P1 in
let pol = PPos in
let parts = verbAgr vp.verb Infinitive Pres a pol.p in -- colloquial, should be Fut, but then present fails...
let p1 = "давайте" in {
s = p1 ++ pol.s ++ vp.adv ! a ++ parts.p2 ++ vp.dep ++ vp.compl ! a
let a = Ag GPl P1 in {
s = (verbEnvAgr "давайте" (vp.adv ! a) vp.verb Infinitive Pres a PPos) ++ vp.dep ++ vp.compl ! a
} ;
-- : NP -> VP -> Utt ; -- let John walk
ImpP3 np vp =
let pol = PPos in
let parts = verbAgr vp.verb Ind Pres np.a pol.p in
let p1 = "пусть" in {
s = p1 ++ pol.s ++ vp.adv ! np.a ++ np.s ! Nom ++ parts.p2 ++ vp.dep ++ vp.compl ! np.a
} ;
ImpP3 np vp = {
s = (verbEnvAgr "пусть" (vp.adv ! np.a ++ np.s ! Nom) vp.verb Ind Pres np.a PPos) ++ vp.dep ++ vp.compl ! np.a
} ;
-- : VP -> VP ; -- is at home himself
SelfAdvVP vp = vp ** {compl=\\a => vp.compl ! a ++ (adjFormsAdjective sam).s ! agrGenNum a ! Animate ! Nom} ;