From 61951cd43d87eb09f65eec58213283da39604b2f Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 1 Dec 2011 21:57:11 +0000 Subject: [PATCH] suppressed clitics in Cat,Spa imperatives restored; Romance clitics with imperatives are still very broken and seem to need an enrichment of the VP type. --- lib/src/catalan/DiffCat.gf | 3 ++- lib/src/italian/DiffIta.gf | 2 +- lib/src/spanish/DiffSpa.gf | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/src/catalan/DiffCat.gf b/lib/src/catalan/DiffCat.gf index fb38421e0..b9c125060 100644 --- a/lib/src/catalan/DiffCat.gf +++ b/lib/src/catalan/DiffCat.gf @@ -92,7 +92,8 @@ oper let pe = case b of {True => P3 ; _ => p} ; agr = {g = g ; n = n ; p = pe} ; - clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ; + clpr = ; ---- TODO: True if clit +---- clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ; ----e verb = case of { ----e => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ; ----e _ => (vp.s ! VPImperat).fin ! agr diff --git a/lib/src/italian/DiffIta.gf b/lib/src/italian/DiffIta.gf index 1f41a24af..5407df393 100644 --- a/lib/src/italian/DiffIta.gf +++ b/lib/src/italian/DiffIta.gf @@ -119,7 +119,7 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud _ => vp.s.s ! vImper n pe } ; neg = vp.neg ! pol ; - compl = clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol + compl = clpr.p1 ++ vp.comp ! agr ++ vp.ext ! pol in neg.p1 ++ verb ++ bindIf clpr.p3 ++ clpr.p1 ++ compl ; ---- TODO non mi mangi diff --git a/lib/src/spanish/DiffSpa.gf b/lib/src/spanish/DiffSpa.gf index 624bea852..d9d0d2956 100644 --- a/lib/src/spanish/DiffSpa.gf +++ b/lib/src/spanish/DiffSpa.gf @@ -95,7 +95,8 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud let pe = case b of {True => P3 ; _ => p} ; agr = {g = g ; n = n ; p = pe} ; - clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ; + clpr = ; ---- TODO: True if clit +---- clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ; ----e verb = case of { ----e => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ; ----e _ => (vp.s ! VPImperat).fin ! agr