1
0
forked from GitHub/gf-rgl

(Est) Keep non-finite forms non-finite in PassV2

TODO: restructure VP so we retain non-finite passive forms
This commit is contained in:
Inari Listenmaa
2022-04-12 19:01:08 +08:00
parent a72600b27c
commit 1f7e16642b
2 changed files with 14 additions and 14 deletions

View File

@@ -163,6 +163,12 @@ param
in in
preOrPost co.isPre co.s nps ; preOrPost co.isPre co.s nps ;
-- Used for passive; c2 of V2/VPSlash becomes sc of VP
compl2subjcase : Compl -> NPForm = \compl ->
case compl.c of {
NPCase Gen => NPCase Nom ; -- valisin koera -> koer valitakse
_ => compl.c -- rääkisin koerale -> koerale räägitakse
} ;
-- For $Verb$. -- For $Verb$.
Verb : Type = { Verb : Type = {

View File

@@ -79,20 +79,14 @@ concrete VerbEst of Verb = CatEst ** open Prelude, ResEst in {
ReflVP v = insertObjPre (\\fin,b,agr => appCompl fin b v.c2 (reflPron agr)) v ; ReflVP v = insertObjPre (\\fin,b,agr => appCompl fin b v.c2 (reflPron agr)) v ;
PassV2 v = PassV2 v =
let let vp = predV v in vp ** {
vp = predV v ; s = \\vf => case vf of {
subjCase = case v.c2.c of { --this is probably a reason to not get rid of NPAcc; TODO check VIFin t => vp.s ! VIPass t ;
NPCase Gen => NPCase Nom ; --valisin koera -> koer valitakse -- VIImper => v.s ! ImperPass ; -- TODO: include these forms from V into VP
_ => v.c2.c --rääkisin koerale -> koerale räägitakse -- VIPresPart => v.s ! PresPart Pass ;
} x => vp.s ! x } ;
in { sc = compl2subjcase v.c2 -- koer valitakse ; koerale räägitakse
s = \\_ => vp.s ! VIPass Pres ;
s2 = \\_,_,_ => [] ;
adv = [] ;
p = vp.p ;
ext = vp.ext ;
sc = subjCase -- koer valitakse ; koerale räägitakse
} ; } ;
----b UseVS, UseVQ = \v -> v ** {c2 = {s = [] ; c = NPAcc ; isPre = True}} ; ----b UseVS, UseVQ = \v -> v ** {c2 = {s = [] ; c = NPAcc ; isPre = True}} ;