(Som) Add more variants of VV

This commit is contained in:
Inari Listenmaa
2019-08-28 16:01:31 +02:00
parent 8f5a45aefb
commit 259b75753e
7 changed files with 65 additions and 20 deletions
+12 -4
View File
@@ -15,10 +15,18 @@ lin
ReflVP = ResSom.insertRefl ;
-- : VV -> VP -> VP ;
ComplVV vv vp = vp ** { -- check Saeed p. 169
s = vv.s ;
vComp = vp.vComp ++ vp.s ! VInf ;
pred = NoPred ;
ComplVV vv vp = let vc = vp.vComp in case vv.isVS of {
True => vp ** {
vComp = vc ** {pr = vv.s ! VInf} ;
obj2 = vp.obj2 ** {s = []} ; -- word order hack to avoid more parameters:
miscAdv = vp.miscAdv ++ vp.obj2.s -- dump it all to miscAdv
} ;
False => vp ** {
s = vv.s ; -- check Saeed p. 169
vComp = vc ** {pst = vc.pst ++ vp.s ! VInf} ;
pred = NoPred ;
}
} ;
-- : VS -> S -> VP ;