forked from GitHub/gf-core
some fixes in clitics in French imperatives
This commit is contained in:
@@ -124,15 +124,14 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in {
|
|||||||
agr = {g = aag.g ; n = num ; p = p} ;
|
agr = {g = aag.g ; n = num ; p = p} ;
|
||||||
verb = vp.s.s ! vImperForm agr ;
|
verb = vp.s.s ! vImperForm agr ;
|
||||||
neg = vp.neg ! pol ;
|
neg = vp.neg ! pol ;
|
||||||
hascl = False ; ----e(pronArg agr.n agr.p vp.clAcc vp.clDat).p3 ;
|
clpr = <vp.clit1 ++ vp.clit2, False> ; ---- TODO: True if clit
|
||||||
clpr = <[],[]> ; ----e pronArgGen pol agr.n agr.p vp.clAcc vp.clDat ;
|
compl = vp.comp ! agr ++ vp.ext ! pol
|
||||||
compl = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol
|
|
||||||
in
|
in
|
||||||
case pol of {
|
case pol of {
|
||||||
Pos => verb ++ if_then_Str hascl "-" [] ++ clpr.p1 ++ compl ;
|
Pos => verb ++ if_then_Str clpr.p2 "-" [] ++ clpr.p1 ++ compl ;
|
||||||
Neg => neg.p1 ++ clpr.p1 ++ verb ++ compl
|
Neg => neg.p1 ++ clpr.p1 ++ verb ++ neg.p2 ++ compl
|
||||||
}
|
}
|
||||||
} ;
|
} ; ---- TODO: vois-le vs. vois-moi vs. ne me vois pas
|
||||||
|
|
||||||
|
|
||||||
negation : Polarity => (Str * Str) = table {
|
negation : Polarity => (Str * Str) = table {
|
||||||
|
|||||||
@@ -112,16 +112,16 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
|
|||||||
let
|
let
|
||||||
pe = case b of {True => P3 ; _ => p} ;
|
pe = case b of {True => P3 ; _ => p} ;
|
||||||
agr = aag ** {p = pe} ;
|
agr = aag ** {p = pe} ;
|
||||||
clpr = <vp.clit1 ++ vp.clit2,[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ;
|
clpr = <vp.clit1 ++ vp.clit2,[],False> ; ---- TODO: True is clit
|
||||||
verb = case <aag.n, pol,pe> of {
|
verb = case <aag.n, pol,pe> of {
|
||||||
<Sg,Neg,P2> => vp.s.s ! VInfin clpr.p3 ; ---- ! aag ;
|
<Sg,Neg,P2> => vp.s.s ! VInfin clpr.p3 ; ---- ! aag ;
|
||||||
_ => vp.s.s ! vImperForm agr
|
_ => vp.s.s ! vImperForm agr
|
||||||
} ;
|
} ;
|
||||||
neg = vp.neg ! pol ;
|
neg = vp.neg ! pol ;
|
||||||
compl = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol
|
compl = clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol
|
||||||
in
|
in
|
||||||
neg.p1 ++ verb ++ bindIf clpr.p3 ++ clpr.p1 ++ compl ;
|
neg.p1 ++ verb ++ bindIf clpr.p3 ++ clpr.p1 ++ compl ;
|
||||||
} ;
|
} ; ---- TODO non mi mangi
|
||||||
|
|
||||||
negation : Polarity => (Str * Str) = table {
|
negation : Polarity => (Str * Str) = table {
|
||||||
Pos => <[],[]> ;
|
Pos => <[],[]> ;
|
||||||
|
|||||||
Reference in New Issue
Block a user