GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-15 22:22:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Romance clitics almost OK ; bug fix in tb -c

Browse Source
This commit is contained in:
aarne
2006-02-14 20:42:36 +00:00
parent a8d99d9571
commit 87ff64e0fc
19 changed files with 165 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/resource-1.0/spanish/DiffSpa.gf
View File

@@ -4,6 +4,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
param
Prep = P_de | P_a ;
NPForm = Ton Case | Aton Case | Poss {g : Gender ; n : Number} ; --- AAgr
VType = VHabere | VRefl ;
oper
@@ -51,6 +52,26 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
vpAgrClit : Agr -> VPAgr = \a ->
vpAgrNone ;
--- This assumes that Acc clitics are in place before Dat.
placeNewClitic = \ci,c,pro,isc,old ->
if_then_Str isc (
case <ci.p3, pro.a.p> of {
<P2,P1> => old ++ pro.s ! Aton c ; -- te me, ---se me
<P3,P3> => "se" ++ old ; -- se lo
_ => pro.s ! Aton c ++ old -- indirect first
}) [] ; -- no clitics
{-
placeNewClitic = \ci,c,pro,isc,old ->
case <ci.p1, ci.p2, ci.p3, pro.a.p, isc> of {
<Acc, Sg, P2, P1, True> => old ++ pro.s ! Aton c ; -- te me, ---se me
<Acc, _, P3, P3, True> => "se" ++ old ; -- se lo
{p5 = True} => pro.s ! Aton c ++ old ; -- indirect first
_ => [] -- no clitics
} ;
-}
negation : Polarity => (Str * Str) = table {
Pos => <[],[]> ;
Neg => <"no",[]>

33
lib/resource-1.0/spanish/MorphoSpa.gf
View File

@@ -92,8 +92,8 @@ oper
-- We follow the rule that the atonic nominative is empty.
mkPronoun : (_,_,_,_,_,_,_,_ : Str) ->
Gender -> Number -> Person -> ClitType -> Pronoun =
\il,le,lui,Lui,son,sa,ses,see,g,n,p,c ->
Gender -> Number -> Person -> Pronoun =
\il,le,lui,Lui,son,sa,ses,see,g,n,p ->
{s = table {
Ton Nom => il ;
Ton x => prepCase x ++ Lui ;
@@ -107,35 +107,8 @@ oper
Poss {n = Pl ; g = Fem} => see
} ;
a = {g = g ; n = n ; p = p} ;
c = c
hasClit = True
} ;
{-
-- used in constructions like "(no) hay ..."
pronEmpty : Number -> Pronoun = \n -> mkPronoun
[]
[]
[]
[]
[] [] [] []
(PGen Masc)
n
P3
Clit2 ;
--2 Reflexive pronouns
--
-- It is simply a function depending on number and person.
pronRefl : Number -> Person -> Str = \n,p -> case <n,p> of {
<Sg,P1> => "me" ;
<Sg,P2> => "te" ;
<_, P3> => "se" ;
<Pl,P1> => "nos" ;
<Pl,P2> => "vos"
} ;
-}
--2 Determiners

2
lib/resource-1.0/spanish/ParadigmsSpa.gf
View File

@@ -302,7 +302,7 @@ oper
mkN3 = \n,p,q -> n ** {lock_N3 = <> ; c2 = p ; c3 = q} ;
mkPN x g = {s = x ; g = g} ** {lock_PN = <>} ;
mkNP x g n = {s = (pn2np (mkPN x g)).s; a = agrP3 g n ; c = Clit0} ** {lock_NP = <>} ;
mkNP x g n = {s = (pn2np (mkPN x g)).s; a = agrP3 g n ; hasClit = False} ** {lock_NP = <>} ;
mkA a b c d e =
compADeg {s = \\_ => (mkAdj a b c d e).s ; isPre = False ; lock_A = <>} ;

18
lib/resource-1.0/spanish/StructuralSpa.gf
View File

@@ -37,7 +37,7 @@ lin
mkPronoun
"el" "lo" "le" "él"
"su" "su" "sus" "sus"
Masc Sg P3 Clit2 ;
Masc Sg P3 ;
here_Adv = mkAdv "aquí" ; -- acá
here7to_Adv = mkAdv ["para acá"] ;
here7from_Adv = mkAdv ["de acá"] ;
@@ -50,13 +50,13 @@ lin
mkPronoun
"yo" "me" "me" "mí"
"mi" "mi" "mis" "mis"
Fem Sg P1 Clit1 ;
Fem Sg P1 ;
in_Prep = mkPreposition "en" ;
it_Pron =
mkPronoun
"el" "lo" "le" "él"
"su" "su" "sus" "sus"
Masc Sg P3 Clit2 ;
Masc Sg P3 ;
less_CAdv = ss "meno" ; ----
many_Det = {s = \\g,c => prepCase c ++ genForms "muchos" "muchas" ! g ; n = Pl} ;
more_CAdv = ss "mas" ;
@@ -77,7 +77,7 @@ lin
mkPronoun
"ella" "la" "le" "ella"
"su" "su" "sus" "sus"
Fem Sg P3 Clit2 ;
Fem Sg P3 ;
so_AdA = ss "tanto" ;
somebody_NP = pn2np (mkPN ["algún"] Masc) ;
somePl_Det = {s = \\g,c => prepCase c ++ genForms "algunos" "algunas" ! g ; n = Pl} ;
@@ -99,7 +99,7 @@ lin
they_Pron = mkPronoun
"ellas" "las" "les" "ellas"
"su" "su" "sus" "sus"
Fem Pl P3 Clit1 ;
Fem Pl P3 ;
this_Quant = {
s = table {
Sg => \\g,c => prepCase c ++ genForms "este" "esta" ! g ;
@@ -118,7 +118,7 @@ lin
mkPronoun
"nosotras" "nos" "nos" "nosotras"
"nuestro" "nuestra" "nuestros" "nuestras"
Fem Pl P1 Clit3 ;
Fem Pl P1 ;
whatSg_IP = {s = \\c => prepCase c ++ ["qué"] ; a = aagr Masc Sg} ;
whatPl_IP = {s = \\c => prepCase c ++ ["qué"] ; a = aagr Masc Pl} ; ---
when_IAdv = ss "cuando" ;
@@ -135,17 +135,17 @@ lin
youSg_Pron = mkPronoun
"tu" "te" "te" "tí"
"tu" "tu" "tus" "tus"
Fem Sg P2 Clit1 ;
Fem Sg P2 ;
youPl_Pron =
mkPronoun
"vosotras" "vos" "vos" "vosotras"
"vuestro" "vuestra" "vuestros" "vuestras"
Fem Pl P2 Clit3 ;
Fem Pl P2 ;
youPol_Pron =
mkPronoun
"usted" "la" "le" "usted"
"su" "su" "sus" "sus"
Fem Pl P2 Clit3 ;
Fem Pl P2 ;
oper
etConj : {s : Str ; n : Number} = {s = pre {