forked from GitHub/gf-core
German infinitives fixed
This commit is contained in:
@@ -13,11 +13,7 @@ concrete PhraseGer of Phrase = CatGer ** open Prelude, ResGer in {
|
|||||||
UttIP ip = {s = ip.s ! Nom} ; --- Acc also
|
UttIP ip = {s = ip.s ! Nom} ; --- Acc also
|
||||||
UttIAdv iadv = iadv ;
|
UttIAdv iadv = iadv ;
|
||||||
UttNP np = {s = np.s ! Acc} ;
|
UttNP np = {s = np.s ! Acc} ;
|
||||||
UttVP vp =
|
UttVP vp = {s = useInfVP vp} ;
|
||||||
let
|
|
||||||
vpi = vp.s ! agrP3 Sg ! VPInfinit Simul --- agr
|
|
||||||
in
|
|
||||||
ss (vp.n2 ! agrP3 Sg ++ vp.a2 ++ vpi.fin ++ infPart False ++ vpi.inf) ;
|
|
||||||
UttAdv adv = adv ;
|
UttAdv adv = adv ;
|
||||||
|
|
||||||
NoPConj = {s = []} ;
|
NoPConj = {s = []} ;
|
||||||
|
|||||||
@@ -522,6 +522,10 @@ resource ResGer = ParamX ** open Prelude in {
|
|||||||
vp.inf ++ vp.ext
|
vp.inf ++ vp.ext
|
||||||
> ;
|
> ;
|
||||||
|
|
||||||
|
useInfVP : VP -> Str = \vp ->
|
||||||
|
let vpi = infVP False vp in
|
||||||
|
vpi.p1 ! agrP3 Sg ++ vpi.p3 ++ vpi.p2 ;
|
||||||
|
|
||||||
-- The nominative case is not used as reflexive, but defined here
|
-- The nominative case is not used as reflexive, but defined here
|
||||||
-- so that we can reuse this in personal pronouns.
|
-- so that we can reuse this in personal pronouns.
|
||||||
-- The missing Sg "ihrer" shows that a dependence on gender would
|
-- The missing Sg "ihrer" shows that a dependence on gender would
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ concrete SentenceGer of Sentence = CatGer ** open ResGer in {
|
|||||||
agr = {n = n ; p = P2} ;
|
agr = {n = n ; p = P2} ;
|
||||||
verb = vp.s ! agr ! VPImperat ;
|
verb = vp.s ! agr ! VPImperat ;
|
||||||
in
|
in
|
||||||
verb.fin ++ vp.a1 ! pol ++ verb.inf ++ vp.n2 ! agr ++ vp.a2 ++ vp.ext
|
verb.fin ++ vp.a1 ! pol ++ verb.inf ++ vp.n2 ! agr ++ vp.a2 ++ vp.inf ++ vp.ext
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
SlashV2 np v2 =
|
SlashV2 np v2 =
|
||||||
@@ -35,7 +35,7 @@ concrete SentenceGer of Sentence = CatGer ** open ResGer in {
|
|||||||
|
|
||||||
EmbedS s = {s = conjThat ++ s.s ! Sub} ;
|
EmbedS s = {s = conjThat ++ s.s ! Sub} ;
|
||||||
EmbedQS qs = {s = qs.s ! QIndir} ;
|
EmbedQS qs = {s = qs.s ! QIndir} ;
|
||||||
EmbedVP vp = {s = "zu" ++ (vp.s ! agrP3 Sg ! VPInfinit Simul).inf} ; --- agr ---- compl
|
EmbedVP vp = {s = useInfVP vp} ;
|
||||||
|
|
||||||
UseCl t a p cl = {s = \\o => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! o} ;
|
UseCl t a p cl = {s = \\o => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! o} ;
|
||||||
UseQCl t a p cl = {s = \\q => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! q} ;
|
UseQCl t a p cl = {s = \\q => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! q} ;
|
||||||
|
|||||||
Reference in New Issue
Block a user