mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-28 01:18:57 -06:00
(Som) Add conditional
This commit is contained in:
@@ -709,11 +709,11 @@ oper
|
|||||||
<Pres,Simul> => {fin = presV vp ; inf = [] } ;
|
<Pres,Simul> => {fin = presV vp ; inf = [] } ;
|
||||||
<Pres,Anter> => {fin = presV copula ; inf = vp.s ! VInf } ; ---- just guessing
|
<Pres,Anter> => {fin = presV copula ; inf = vp.s ! VInf } ; ---- just guessing
|
||||||
<Past,Simul> => {fin = pastV vp ; inf = [] } ;
|
<Past,Simul> => {fin = pastV vp ; inf = [] } ;
|
||||||
<Past,Anter> => {fin = pastV (aux "jir" vp) ; inf = []} ;
|
<Past,Anter> => {fin = pastV (cSug "jir") ; inf = vp.s ! VInf} ;
|
||||||
<Fut,Simul> => {fin = presV (aux "doon" vp) ; inf = []} ;
|
<Fut,Simul> => {fin = presV (cSug "doon") ; inf = vp.s ! VInf} ;
|
||||||
<Fut,Anter> => {fin = pastV (aux "doon" vp) ; inf = []} ;
|
<Fut,Anter> => {fin = pastV (cSug "doon") ; inf = vp.s ! VInf} ;
|
||||||
<_,Simul> => {fin = presV vp ; inf = []} ; -- TODO conditional
|
<Cond,Simul> => {fin = presV have_V ; inf = vp.s ! VInf} ; -- TODO check
|
||||||
<_,Anter> => {fin = pastV vp ; inf = []} -- TODO conditional
|
<Cond,Anter> => {fin = pastV have_V ; inf = vp.s ! VInf} -- TODO check
|
||||||
}
|
}
|
||||||
where {
|
where {
|
||||||
pastV : Verb -> Str = \v ->
|
pastV : Verb -> Str = \v ->
|
||||||
@@ -721,9 +721,6 @@ oper
|
|||||||
Pos => v.s ! VPast Simple agr } ;
|
Pos => v.s ! VPast Simple agr } ;
|
||||||
|
|
||||||
presV : Verb -> Str = \v -> v.s ! VPres Simple agr p ;
|
presV : Verb -> Str = \v -> v.s ! VPres Simple agr p ;
|
||||||
|
|
||||||
aux : Str -> Verb -> Verb = \jir,v ->
|
|
||||||
let jir : Verb = cSug jir in {s = \\vf => v.s ! VInf ++ jir.s ! vf}
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
stmarker : Agreement => Polarity => Str = \\a,b =>
|
stmarker : Agreement => Polarity => Str = \\a,b =>
|
||||||
|
|||||||
Reference in New Issue
Block a user