diff --git a/lib/src/french/DiffFre.gf b/lib/src/french/DiffFre.gf index bdb85ec1e..3f178a4f0 100644 --- a/lib/src/french/DiffFre.gf +++ b/lib/src/french/DiffFre.gf @@ -124,15 +124,14 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in { agr = {g = aag.g ; n = num ; p = p} ; verb = vp.s.s ! vImperForm agr ; neg = vp.neg ! pol ; - hascl = False ; ----e(pronArg agr.n agr.p vp.clAcc vp.clDat).p3 ; - clpr = <[],[]> ; ----e pronArgGen pol agr.n agr.p vp.clAcc vp.clDat ; - compl = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol + clpr = ; ---- TODO: True if clit + compl = vp.comp ! agr ++ vp.ext ! pol in case pol of { - Pos => verb ++ if_then_Str hascl "-" [] ++ clpr.p1 ++ compl ; - Neg => neg.p1 ++ clpr.p1 ++ verb ++ compl + Pos => verb ++ if_then_Str clpr.p2 "-" [] ++ clpr.p1 ++ 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 { diff --git a/lib/src/italian/DiffIta.gf b/lib/src/italian/DiffIta.gf index 0aa92879f..cfe8304f9 100644 --- a/lib/src/italian/DiffIta.gf +++ b/lib/src/italian/DiffIta.gf @@ -112,16 +112,16 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud let pe = case b of {True => P3 ; _ => p} ; agr = aag ** {p = pe} ; - clpr = ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ; + clpr = ; ---- TODO: True is clit verb = case of { => vp.s.s ! VInfin clpr.p3 ; ---- ! aag ; _ => vp.s.s ! vImperForm agr } ; 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 neg.p1 ++ verb ++ bindIf clpr.p3 ++ clpr.p1 ++ compl ; - } ; + } ; ---- TODO non mi mangi negation : Polarity => (Str * Str) = table { Pos => <[],[]> ;