msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

more verbs; moved negation after adv because adv can have not_AdA

Browse Source
This commit is contained in:
Roman Suzi
2020-08-21 23:43:09 +03:00
parent ecb032770e
commit 5a3f5e430a
11 changed files with 133 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/russian/ResRus.gf
+11 -8
View File
@@ -607,6 +607,10 @@ oper
mkVplus : VerbForms -> VerbForms
= \vf -> vf ;
mkV2plus : VerbForms2 -> VerbForms2
= \vf -> vf ;
mkV3plus : VerbForms3 -> VerbForms3
= \vf -> vf ;
quickGuessVerbForms : Str -> VerbForms
= \inf ->
@@ -846,13 +850,13 @@ oper
<Infinitive, _, _> => subj ++ pol.s ++ adv ++ verbInf vf
} ;
_ => case <m,temp> of {
<Ind, Past> => subj ++ pol.s ++ adv ++ verbPastAgree vf a "" ;
<Ind, Pres> => subj ++ pol.s ++ adv ++ verbPresAgree vf a ;
<Ind, Fut> => subj ++ pol.s ++ adv ++ verbFutAgree vf a ;
<Ind, Cond> => subj ++ pol.s ++ adv ++ verbPastAgree vf a "бы" ;
<Sbjv, _> => subj ++ pol.s ++ adv ++ verbPastAgree vf a "бы" ;
<Imperative, _> => let p = verbImperativeAgree vf a in p.p1 ++ subj ++ pol.s ++ adv ++ p.p2 ;
<Infinitive, _> => subj ++ pol.s ++ adv ++ verbInf vf
<Ind, Past> => subj ++ adv ++ pol.s ++ verbPastAgree vf a "" ;
<Ind, Pres> => subj ++ adv ++ pol.s ++ verbPresAgree vf a ;
<Ind, Fut> => subj ++ adv ++ pol.s ++ verbFutAgree vf a ;
<Ind, Cond> => subj ++ adv ++ pol.s ++ verbPastAgree vf a "бы" ;
<Sbjv, _> => subj ++ adv ++ pol.s ++ verbPastAgree vf a "бы" ;
<Imperative, _> => let p = verbImperativeAgree vf a in p.p1 ++ subj ++ adv ++ pol.s ++ p.p2 ;
<Infinitive, _> => subj ++ adv ++ pol.s ++ verbInf vf
}
} ;
@@ -1539,7 +1543,6 @@ oper
-- Misc
oper
ComplementCase : Type = {s : Str ; c : Case ; neggen : Bool ; hasPrep : Bool} ;
applyPrep : ComplementCase -> NounPhrase -> Str
= \prep,np -> case <np.pron, prep.hasPrep, prep.c> of {