update the changed params to ResEus

This commit is contained in:
Inari Listenmaa
2017-10-13 11:11:29 +02:00
parent a6966175b0
commit 47bab9e77f

View File

@@ -502,21 +502,21 @@ oper
verbformPeriphrastic : Tense -> Anteriority -> VerbPhrase -> {aux : Agr => VForms ; prc : Str} = \t,a,vp -> verbformPeriphrastic : Tense -> Anteriority -> VerbPhrase -> {aux : Agr => VForms ; prc : Str} = \t,a,vp ->
let adl : IntransV = chooseAux vp ; let adl : IntransV = chooseAux vp ;
in case <t,a> of { in case <t,a> of {
<Pres,Simul> => {aux = adl ! Pres ; prc = vp.prc ! Pres} ; --noa / lo egiten da <Pres,Simul> => {aux = adl ! APres ; prc = vp.prc ! Pres} ; --noa / lo egiten da
<Pres,Anter> => {aux = adl ! Pres ; prc = vp.prc ! Past} ; --joan da / lo egin da <Pres,Anter> => {aux = adl ! APres ; prc = vp.prc ! Past} ; --joan da / lo egin da
<Past,Simul> => {aux = adl ! Past ; prc = vp.prc ! Pres} ; --nindoan / lo egiten zen <Past,Simul> => {aux = adl ! APast ; prc = vp.prc ! Pres} ; --nindoan / lo egiten zen
<Past,Anter> => {aux = adl ! Past ; prc = vp.prc ! Past} ; --joan nintzen / ... <Past,Anter> => {aux = adl ! APast ; prc = vp.prc ! Past} ; --joan nintzen / ...
<Fut,Simul> => {aux = adl ! Pres ; prc = vp.prc ! Fut} ; --joango da <Fut,Simul> => {aux = adl ! APres ; prc = vp.prc ! Fut} ; --joango da
<Fut,Anter> => {aux = adl ! Pres ; prc = vp.prc ! Fut} ; --joango nintzen <Fut,Anter> => {aux = adl ! APres ; prc = vp.prc ! Fut} ; --joango nintzen
<Cond,Simul> => {aux = adl ! Cond ; prc = vp.prc ! Fut} ; --joango nintzateke <Cond,Simul> => {aux = adl ! ACond ; prc = vp.prc ! Fut} ; --joango nintzateke
<Cond,Anter> => {aux = adl ! Cond ; prc = vp.prc ! Past} } ;--joan nintzateke <Cond,Anter> => {aux = adl ! ACond ; prc = vp.prc ! Past} } ;--joan nintzateke
--TODO: write a fallback for synthetic verbs without all forms --TODO: write a fallback for synthetic verbs without all forms
verbformSynthetic : Tense -> Anteriority -> VerbPhrase -> {aux : Agr => VForms ; prc : Str} = \t,a,vp -> verbformSynthetic : Tense -> Anteriority -> VerbPhrase -> {aux : Agr => VForms ; prc : Str} = \t,a,vp ->
let adt : IntransV = chooseAux vp ; let adt : IntransV = chooseAux vp ;
in case <t,a> of { in case <t,a> of {
<Pres,Simul> => {aux = adt ! Pres ; prc = []} ; --noa <Pres,Simul> => {aux = adt ! APres ; prc = []} ; --noa
<Past,Simul> => {aux = adt ! Past ; prc = []} ; --nindoan <Past,Simul> => {aux = adt ! APast ; prc = []} ; --nindoan
_ => verbformPeriphrastic t a (vp ** {val = defaultAux vp.val}) } ; _ => verbformPeriphrastic t a (vp ** {val = defaultAux vp.val}) } ;