1
0
forked from GitHub/gf-core

Overload partV ; fix typo in IrregDut ; fix word order in subordinate clauses in ResDut

This commit is contained in:
inari
2014-06-19 15:04:36 +00:00
parent b953e782f6
commit 7cc6787454
3 changed files with 20 additions and 7 deletions

View File

@@ -176,7 +176,7 @@ lin wrijven_V = mkV "wrijven" "wreef" "wreven" "gewreven" ;
lin wringen_V = mkV "wringen" "wrong" "wrongen" "gewrongen" ;
lin zeggen_V = mkV "zeggen" "zei" "zeiden" "gezegd" ;
lin zenden_V = mkV "zenden" "zond" "zonden" "gezonden" ;
lin zien_V = mkV "zien" "ziet" "zien" "zag" "zagen" "gezien" ;
lin zien_V = mkV "zie" "ziet" "zien" "zag" "zagen" "gezien" ;
lin zijgen_V = mkZijnV "zijgen" "zeeg" "zegen" "gezegen" ;
lin zingen_V = mkV "zingen" "zong" "zongen" "gezongen" ;
lin zinken_V = mkZijnV "zinken" "zonk" "zonken" "gezonken" ;

View File

@@ -269,8 +269,12 @@ oper
zijnV v = lin V (v2vvAux v VZijn) ;
reflV v = lin V {s = v.s ; aux = v.aux ; particle = v.particle ; prefix = v.prefix ; vtype = VRefl} ;
partV : V -> Str -> V = \vinden,leuk ->
vinden ** {particle = leuk} ;
partV = overload {
partV : Str -> V -> V = \leuk,vinden ->
vinden ** {particle = leuk} ;
partV : V -> Str -> V = \vinden,leuk ->
vinden ** {particle = leuk} ;
} ;
no_geV v = let vs = v.s in {
s = table {

View File

@@ -605,11 +605,20 @@ param
} --# notpresent
;
extra = vp.ext ;
--for the Sub word order
inffin =
case <a,vp.isAux> of { --# notpresent
<Anter,True> => fin ++ inf ; -- double inf --# notpresent
_ => --# notpresent
inf ++ fin --- or just auxiliary vp
case <t,a,vp.isAux> of { --# notpresent
-- gezien zou/zal hebben
<Cond,Anter,False> => vperf ++ fin ++ auxv ! VInf ; --# notpresent
<Fut,Anter,False> => vperf ++ fin ++ auxv ! VInf ; --# notpresent
-- zou/zal zien
<Cond,Simul,False> => fin ++ verb.p2 ; --# notpresent
<Fut,Simul,False> => fin ++ verb.p2 ; --# notpresent
-- wil kunnen zien (first line in inf)
<_,Anter,True> => fin ++ inf ; -- double inf --# notpresent
_ => fin ++ inf --# notpresent
-- no inf ++ fin, this is not German :-P
} --# notpresent
in
case o of {