mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-10 19:52:50 -06:00
change in Romance agreement to produce correct number for polite singular pronouns ; linking functions that involve mkClause now takes a long time and should be revised
This commit is contained in:
@@ -77,8 +77,9 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
|
||||
_ => VPAgrSubj
|
||||
} ;
|
||||
|
||||
vpAgrClit : Agr -> VPAgr = \a ->
|
||||
VPAgrClit a.g a.n ; --- subty
|
||||
vpAgrClit : Agr -> VPAgr = \a0 ->
|
||||
let a = complAgr a0 in
|
||||
VPAgrClit a.g a.n ;
|
||||
|
||||
pronArg = \n,p,acc,dat ->
|
||||
let
|
||||
@@ -108,10 +109,11 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
|
||||
infForm n p x y = (pronArg n p x y).p3 ;
|
||||
|
||||
mkImperative b p vp = {
|
||||
s = \\pol,aag =>
|
||||
s = \\pol,agr =>
|
||||
let
|
||||
pe = case b of {True => P3 ; _ => p} ;
|
||||
agr = aag ** {p = pe} ;
|
||||
---- agr = aag ** {p = pe} ;
|
||||
aag = verbAgr agr ; ----
|
||||
clpr = <vp.clit1 ++ vp.clit2,[],False> ; ---- TODO: True is clit
|
||||
verb = case <aag.n, pol,pe> of {
|
||||
<Sg,Neg,P2> => vp.s.s ! VInfin clpr.p3 ; ---- ! aag ;
|
||||
|
||||
@@ -18,7 +18,8 @@ concrete IdiomIta of Idiom = CatIta **
|
||||
(insertComplement (\\_ => ad.s) (predV copula))) ;
|
||||
|
||||
ExistNP np =
|
||||
mkClause [] True (agrP3 np.a.g np.a.n)
|
||||
let npa = complAgr np.a in
|
||||
mkClause [] True (agrP3 npa.g npa.n)
|
||||
(insertClit3 (elision "ci" "c'" "ci")
|
||||
(insertComplement (\\_ => (np.s ! Nom).ton)
|
||||
(predV copula))) ;
|
||||
@@ -43,7 +44,7 @@ concrete IdiomIta of Idiom = CatIta **
|
||||
(predV (essereV (verboV (stare_16 "stare")))) ;
|
||||
|
||||
ImpPl1 vp = {s =
|
||||
(mkImperative False P1 vp).s ! Pos ! {n = Pl ; g = Masc} --- fem
|
||||
(mkImperative False P1 vp).s ! Pos ! Ag Masc Pl P1 --- fem
|
||||
} ;
|
||||
|
||||
}
|
||||
|
||||
@@ -154,7 +154,7 @@ oper
|
||||
<Pl,Masc> => ses ;
|
||||
<Pl,Fem> => see
|
||||
} ;
|
||||
a = {g = g ; n = n ; p = p} ;
|
||||
a = Ag g n p ;
|
||||
hasClit = True
|
||||
} ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user