GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
aarne
2011-12-01 21:57:11 +00:00
parent 56f66aa0ab
commit 61951cd43d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/src/catalan/DiffCat.gf
View File

@@ -92,7 +92,8 @@ oper
let let
pe = case b of {True => P3 ; _ => p} ; pe = case b of {True => P3 ; _ => p} ;
agr = {g = g ; n = n ; p = pe} ; agr = {g = g ; n = n ; p = pe} ;
clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ; clpr = <vp.clit1 ++ vp.clit2, [],False> ; ---- TODO: True if clit
---- clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ;
----e verb = case <aag.n, pol,pe> of { ----e verb = case <aag.n, pol,pe> of {
----e <Sg,Neg,P2> => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ; ----e <Sg,Neg,P2> => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ;
----e _ => (vp.s ! VPImperat).fin ! agr ----e _ => (vp.s ! VPImperat).fin ! agr

2
lib/src/italian/DiffIta.gf
View File

@@ -119,7 +119,7 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
_ => vp.s.s ! vImper n pe _ => vp.s.s ! vImper n pe
} ; } ;
neg = vp.neg ! pol ; neg = vp.neg ! pol ;
compl = clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol compl = clpr.p1 ++ 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 ---- TODO non mi mangi

3
lib/src/spanish/DiffSpa.gf
View File

@@ -95,7 +95,8 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
let let
pe = case b of {True => P3 ; _ => p} ; pe = case b of {True => P3 ; _ => p} ;
agr = {g = g ; n = n ; p = pe} ; agr = {g = g ; n = n ; p = pe} ;
clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ; clpr = <vp.clit1 ++ vp.clit2, [],False> ; ---- TODO: True if clit
---- clpr = <[],[],False> ; ----e pronArg agr.n agr.p vp.clAcc vp.clDat ;
----e verb = case <aag.n, pol,pe> of { ----e verb = case <aag.n, pol,pe> of {
----e <Sg,Neg,P2> => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ; ----e <Sg,Neg,P2> => (vp.s ! VPInfinit Simul clpr.p3).inf ! aag ;
----e _ => (vp.s ! VPImperat).fin ! agr ----e _ => (vp.s ! VPImperat).fin ! agr