msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

trying to fix word order in ExtendGer.PredVPS ; not yet correct for Sub

Browse Source
This commit is contained in:
Aarne Ranta
2024-07-22 23:47:03 +02:00
parent 687f0cefc8
commit 6084aef91b
1 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/german/ExtendGer.gf
View File

@@ -53,15 +53,50 @@ concrete ExtendGer of Extend =
lincat lincat
VPI = {s : Bool => Str} ; VPI = {s : Bool => Str} ;
[VPI] = {s1,s2 : Bool => Str} ; [VPI] = {s1,s2 : Bool => Str} ;
VPS = {s : Order => Agr => Str} ; VPS = {s : Order => Agr => {verb, compl : Str}} ;
[VPS] = {s1,s2 : Order => Agr => Str} ; [VPS] = {s : Order => Agr => {s1, s2, s3 : Str}} ; -- liebe, (ich) dich, (und) bin glücklich
lin lin
BaseVPI = twoTable Bool ; BaseVPI = twoTable Bool ;
ConsVPI = consrTable Bool comma ; ConsVPI = consrTable Bool comma ;
BaseVPS = twoTable2 Order Agr ; BaseVPS v w = {
ConsVPS = consrTable2 Order Agr comma ; s = \\ord, agr =>
let
vs = v.s ! ord ! agr ;
ws = w.s ! ord ! agr ;
in {
s1 = vs.verb ;
s2 = vs.compl ;
s3 = case ord of {
Sub => ws.compl ++ ws.verb ;
_ => ws.verb ++ ws.compl
}
}
} ;
ConsVPS v vv = {
s = \\ord, agr =>
let
vs = v.s ! ord ! agr ;
vvs = vv.s ! ord ! agr ;
in {
s1 = vs.verb ;
s2 = vs.compl ++ comma ++ vvs.s1 ++ vvs.s2 ;
s3 = vvs.s3
}
} ;
ConjVPS conj vv = {
s = \\ord, agr =>
let
vvs = vv.s ! ord ! agr
in {
verb = vvs.s1 ;
compl = conj.s1 ++ vvs.s2 ++ conj.s2 ++ vvs.s3
}
} ;
MkVPS tm p vp = MkVPS tm p vp =
let vps = useVP vp in { let vps = useVP vp in {
@@ -112,26 +147,29 @@ concrete ExtendGer of Extend =
} ; } ;
extra = vp.inf.extr!agr ++ vp.ext ; extra = vp.inf.extr!agr ++ vp.ext ;
in in
--- AR 22/7/2024 as the subject comes to a wrong place in PredVPS Inv
{verb = verb.fin ; compl = compl ++ infCompl ++ pred.inf ++ extra}
{-
case o of { case o of {
Main => subj ++ verb.fin ++ compl ++ infCompl ++ pred.inf ++ extra ; Main => verb.fin ++ compl ++ infCompl ++ pred.inf ++ extra ;
Inv => verb.fin ++ subj ++ compl ++ infCompl ++ pred.inf ++ extra ; Inv => verb.fin ++ subj ++ compl ++ infCompl ++ pred.inf ++ extra ;
Subj => subj ++ compl ++ pred.infComplfin ++ extra Subj => subj ++ compl ++ pred.infComplfin ++ extra
} }
-}
} ; } ;
ConjVPS = conjunctDistrTable2 Order Agr ;
PredVPS np vpi = PredVPS np vps =
let let
subj = np.s ! False ! Nom ++ bigNP np ; subj = np.s ! False ! Nom ++ bigNP np ;
agr = np.a ; agr = np.a ;
in { in {
s = \\o => s = \\o =>
let verb = vpi.s ! o ! agr let verb = vps.s ! o ! agr
in case o of { in case o of {
Main => subj ++ verb ; Main => subj ++ verb.verb ++ verb.compl ;
Inv => verb ++ subj ; ---- älskar henne och sover jag Inv => verb.verb ++ subj ++ verb.compl ; -- älskar jag henne och sover
Sub => subj ++ verb Sub => subj ++ verb.verb ++ verb.compl --- not quite correct in ConjVPS
} }
} ; } ;