1
0
forked from GitHub/gf-rgl

(Pes) Remove compound tenses from V and add new VerbForms.

WIP:
* tenses with different classes of VV
* Fut and Cond Anter
* Progressive forms for copula and have_V2
This commit is contained in:
Inari Listenmaa
2019-02-26 16:58:16 +01:00
parent f840f6aaff
commit d45303ae17
9 changed files with 231 additions and 228 deletions
+4 -4
View File
@@ -14,20 +14,20 @@ concrete VerbPes of Verb = CatPes ** open ResPes,Prelude in {
ComplSlash = complSlash ;
ComplVV v vp = insertVV (infVV v.isAux vp) (predV v) ;
ComplVV v vp = insertVV v.isDef (infVV v vp) (predV v) ;
ComplVS v s = embComp (conjThat ++ s.s) (predV v) ;
ComplVQ v q = embComp (conjThat ++ q.s ! QIndir) (predV v) ;
ComplVA v ap = insertObj (ap.s ! Bare) (predV v) ; -- check form of adjective
SlashV2V v vp = insertVV (infVV v.isAux vp) (predV v) **{c2 = {s = v.c1 ; ra = []}} ;
SlashV2V v vp = insertVV v.isDef (infVV v vp) (predV v) **{c2 = {s = v.c1 ; ra = []}} ;
SlashV2S v s = v ** embComp (conjThat ++ s.s) (predV v) ;
SlashV2Q v q = v ** embComp (q.s ! QIndir) (predV v) ;
SlashV2A v ap = v ** insertObj (ap.s ! Bare) (predV v) ; ---- paint it red , check form of adjective
SlashVV vv vps = vps ** insertVV (infVV vv.isAux vps) (predV vv) ;
SlashVV vv vps = vps ** insertVV vv.isDef (infVV vv vps) (predV vv) ;
SlashV2VNP v2v np vps =
let vvVP : VPH = insertVV (infVV v2v.isAux vps) (predV v2v) ;
let vvVP : VPH = insertVV v2v.isDef (infVV v2v vps) (predV v2v) ;
vvVPS = vvVP ** {c2={s=v2v.c1 ; ra=v2v.c2}} ; -- TODO find out if it's a general rule; only one V2V in the lexicon /IL
in complSlash vvVPS np ** {c2 = vps.c2} ;