forked from GitHub/gf-rgl
(Dut) useInfVP depend on agreement; ProgrVP adds a complement, not adverb
This commit is contained in:
@@ -11,7 +11,7 @@ concrete ExtraDut of ExtraDutAbs = CatDut **
|
||||
BaseVPI = twoTable Bool ;
|
||||
ConsVPI = consrTable Bool comma ;
|
||||
|
||||
MkVPI vp = {s = \\b => useInfVP b vp} ;
|
||||
MkVPI vp = {s = \\b => useInfVP b vp ! agrP3 Sg } ;
|
||||
ConjVPI = conjunctDistrTable Bool ;
|
||||
|
||||
ComplVPIVV v vpi =
|
||||
|
||||
@@ -32,7 +32,7 @@ concrete IdiomDut of Idiom = CatDut **
|
||||
}
|
||||
} ;
|
||||
|
||||
ProgrVP vp = insertAdv ("aan" ++ "het" ++ useInfVP True vp) (predV zijn_V) ;
|
||||
ProgrVP vp = insertObj (\\agr => "aan" ++ "het" ++ useInfVP True vp ! agr) (predV zijn_V) ;
|
||||
|
||||
ImpPl1 vp =
|
||||
let
|
||||
|
||||
@@ -16,7 +16,7 @@ concrete PhraseDut of Phrase = CatDut ** open Prelude, ResDut in
|
||||
UttIP ip = {s = ip.s ! NPNom} ; --- Acc also
|
||||
UttIAdv iadv = iadv ;
|
||||
UttNP np = {s = np.s ! NPNom} ;
|
||||
UttVP vp = {s = useInfVP True vp} ; -- without zu
|
||||
UttVP vp = {s = useInfVP True vp ! agrP3 Sg } ; -- without zu
|
||||
UttAdv adv = adv ;
|
||||
UttCN n = {s = n.s ! Strong ! NF Sg Nom} ;
|
||||
UttCard n = {s = n.s ! Utr ! Nom} ;
|
||||
|
||||
@@ -642,9 +642,9 @@ param
|
||||
vp.inf.p1 ++ vp.ext
|
||||
> ;
|
||||
|
||||
useInfVP : Bool -> VP -> Str = \isAux,vp ->
|
||||
useInfVP : Bool -> VP -> Agr => Str = \isAux,vp ->
|
||||
let vpi = infVP isAux vp in
|
||||
vpi.p1 ! agrP3 Sg ++ vpi.p2 ++ vpi.p3 ; -- TODO
|
||||
\\agr => vpi.p1 ! agr ++ vpi.p2 ++ vpi.p3 ;
|
||||
|
||||
reflPron : Agr => Str = table {
|
||||
{n = Sg ; p = P1} => "mijzelf" ;
|
||||
|
||||
@@ -51,7 +51,7 @@ concrete SentenceDut of Sentence = CatDut ** open ResDut, Prelude in {
|
||||
|
||||
EmbedS s = {s = conjThat ++ s.s ! Sub} ;
|
||||
EmbedQS qs = {s = qs.s ! QIndir} ;
|
||||
EmbedVP vp = {s = useInfVP False vp} ;
|
||||
EmbedVP vp = {s = useInfVP False vp ! agrP3 Sg } ;
|
||||
|
||||
UseCl t p cl = {
|
||||
s = \\o => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! o
|
||||
|
||||
Reference in New Issue
Block a user