made Vvform applicable in Pes.VP

This commit is contained in:
Aarne Ranta
2018-03-21 15:46:50 +01:00
parent 07f538cd4e
commit 8c09103819

View File

@@ -100,7 +100,8 @@ oper
| VPerfFut
| VCondSimul
| VCondAnter -- subj na "I می گْ"
;
| VVVForm -- AR 21/3/2018 for mustCl after Nasrin
;
VType = VIntrans | VTrans | VTransPost ;
@@ -333,8 +334,6 @@ mkSlClause : NP -> VPH -> SlClause = \np,vp -> {
<Pos,VPerfFut> => case vp.wish of
{True => vp.s ! VPTense Pos (VPPres Anter) (AgPes n p) ;
False => vp.s ! VPTense Pos (VPFutr Anter) (AgPes n p) }; -- verb form need to be confirmed
<Pos,VCondSimul> => vp.s ! VPTense Pos (VPCond Simul) (AgPes n p) ;
<Pos,VCondAnter> => vp.s ! VPTense Pos (VPCond Anter) (AgPes n p); -- verb form to be confirmed
<Neg,VPerfPast> => vp.s ! VPTense Neg (VPPast Anter) (AgPes n p) ;
<Neg,VFut> => case vp.wish of
{True => vp.s ! VPTense Neg (VPPres Simul) (AgPes n p) ;
@@ -342,11 +341,16 @@ mkSlClause : NP -> VPH -> SlClause = \np,vp -> {
<Neg,VPerfFut> => case vp.wish of
{True => vp.s ! VPTense Neg (VPPres Anter) (AgPes n p) ;
False => vp.s ! VPTense Neg (VPFutr Anter) (AgPes n p) }; -- verb form need to be confirmed
<Pos,VCondSimul> => vp.s ! VPTense Pos (VPCond Simul) (AgPes n p) ;
<Pos,VCondAnter> => vp.s ! VPTense Pos (VPCond Anter) (AgPes n p); -- verb form to be confirmed
<Neg,VCondSimul> => vp.s ! VPTense Neg (VPCond Simul) (AgPes n p) ;
<Neg,VCondAnter> => vp.s ! VPTense Neg (VPCond Anter) (AgPes n p) -- verb form to be confirmed
<Neg,VCondAnter> => vp.s ! VPTense Neg (VPCond Anter) (AgPes n p) ; -- verb form to be confirmed
<_, VVVForm> => vp.s ! VVForm (AgPes n p) -- AR 21/3/2018
};
---- VVForm (AgPes n p) => {inf = verb.s ! Vvform (AgPes n p)} ;
@@ -388,8 +392,8 @@ mkSClause : Str -> AgrPes -> VPH -> Clause = \subj,agr,vp -> {
{True => vp.s ! VPTense Neg (VPPres Anter) (AgPes n p) ;
False => vp.s ! VPTense Neg (VPFutr Anter) (AgPes n p) }; -- verb form need to be confirmed
<Neg,VCondSimul> => vp.s ! VPTense Neg (VPCond Simul) (AgPes n p) ;
<Neg,VCondAnter> => vp.s ! VPTense Neg (VPCond Anter) (AgPes n p) -- verb form to be confirmed
<Neg,VCondAnter> => vp.s ! VPTense Neg (VPCond Anter) (AgPes n p) ; -- verb form to be confirmed
<_, VVVForm> => vp.s ! VVForm (AgPes n p) -- AR 21/3/2018
};