fixed notpresent flags in ResDut.gf so that it compiles with the -present option

This commit is contained in:
aarne
2014-06-19 16:20:01 +00:00
parent 8cb9364af0
commit aad954a8f5

View File

@@ -597,29 +597,29 @@ param
True => neg ++ obj0 ++ obj ++ part ++ vp.a2 ++ vp.s.prefix ; True => neg ++ obj0 ++ obj ++ part ++ vp.a2 ++ vp.s.prefix ;
_ => obj0 ++ obj ++ neg ++ part ++ vp.a2 ++ vp.s.prefix _ => obj0 ++ obj ++ neg ++ part ++ vp.a2 ++ vp.s.prefix
} ; } ;
inf = inf : Str =
case <vp.isAux, vp.inf.p2, a> of { --# notpresent case <vp.isAux, vp.inf.p2, a> of {
<True,True,Anter> => vp.s.s ! VInf ++ vp.inf.p1 ; --# notpresent <True,True,Anter> => vp.s.s ! VInf ++ vp.inf.p1 ; --# notpresent
_ => --# notpresent _ =>
vp.inf.p1 ++ verb.p2 vp.inf.p1 ++ verb.p2
} --# notpresent }
; ;
extra = vp.ext ; extra = vp.ext ;
--for the Sub word order --for the Sub word order
inffin = inffin : Str =
case <t,a,vp.isAux> of { --# notpresent case <t,a,vp.isAux> of {
-- gezien zou/zal hebben -- gezien zou/zal hebben
<Cond,Anter,False> => vperf ++ fin ++ auxv ! VInf ; --# notpresent <Cond,Anter,False> => vperf ++ fin ++ auxv ! VInf ; --# notpresent
<Fut,Anter,False> => vperf ++ fin ++ auxv ! VInf ; --# notpresent <Fut,Anter,False> => vperf ++ fin ++ auxv ! VInf ; --# notpresent
-- zou/zal zien -- zou/zal zien
<Cond,Simul,False> => fin ++ verb.p2 ; --# notpresent <Cond,Simul,False> => fin ++ verb.p2 ;
<Fut,Simul,False> => fin ++ verb.p2 ; --# notpresent <Fut,Simul,False> => fin ++ verb.p2 ;
-- wil kunnen zien (first line in inf) -- wil kunnen zien (first line in inf)
<_,Anter,True> => fin ++ inf ; -- double inf --# notpresent <_,Anter,True> => fin ++ inf ; -- double inf --# notpresent
_ => fin ++ inf --# notpresent _ => fin ++ inf
-- no inf ++ fin, this is not German :-P -- no inf ++ fin, this is not German :-P
} --# notpresent }
in in
case o of { case o of {
Main => subj ++ fin ++ compl ++ inf ++ extra ; Main => subj ++ fin ++ compl ++ inf ++ extra ;