GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 17:08:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Spa) Update A,A2 to not have Degree

Browse Source
This commit is contained in:
Inari Listenmaa
2021-09-13 15:15:47 +08:00
parent 862c50e936
commit 57390d366c
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/spanish/DiffSpa.gf
View File

@@ -70,6 +70,7 @@ instance DiffSpa of DiffRomance - [iAdvQuestionInv,otherInv,partAgr,stare_V,vpAg
_ => prepCase c ++ artDef g Sg (CPrep P_de) _ => prepCase c ++ artDef g Sg (CPrep P_de)
} ; } ;
-} -}
piuComp = "más" ;
conjunctCase : Case -> Case = \c -> case c of { conjunctCase : Case -> Case = \c -> case c of {
Nom => Nom ; Nom => Nom ;

4
src/spanish/DocumentationSpaFunctor.gf
View File

@@ -45,8 +45,8 @@ lin
s1 = heading1 (nounHeading adjective_Category).s ; s1 = heading1 (nounHeading adjective_Category).s ;
s2 = frameTable ( s2 = frameTable (
tr (th "" ++ th (heading singular_Parameter) ++ th (heading plural_Parameter)) ++ tr (th "" ++ th (heading singular_Parameter) ++ th (heading plural_Parameter)) ++
tr (th (heading masculine_Parameter) ++ td (adj.s ! Posit ! genNum2Aform Masc Sg) ++ td (adj.s ! Posit ! (genNum2Aform Masc Pl))) ++ tr (th (heading masculine_Parameter) ++ td (adj.s ! genNum2Aform Masc Sg) ++ td (adj.s ! genNum2Aform Masc Pl)) ++
tr (th (heading feminine_Parameter) ++ td (adj.s ! Posit ! genNum2Aform Fem Sg) ++ td (adj.s ! Posit ! (genNum2Aform Fem Pl))) tr (th (heading feminine_Parameter) ++ td (adj.s ! genNum2Aform Fem Sg) ++ td (adj.s ! genNum2Aform Fem Pl))
) )
} ; } ;

2
src/spanish/MorphoSpa.gf
View File

@@ -239,7 +239,7 @@ oper
mkOrdinal : A -> Ord = \adj-> mkOrdinal : A -> Ord = \adj->
lin Ord { lin Ord {
s = \\ag => adj.s ! Posit ! genNum2Aform ag.g ag.n ; s = \\ag => adj.s ! genNum2Aform ag.g ag.n ;
} ; } ;
mkQuantifier : (ese,esa,esos,esas : Str) -> Quant = \ese,esa,esos,esas-> mkQuantifier : (ese,esa,esos,esas : Str) -> Quant = \ese,esa,esos,esas->

33
src/spanish/ParadigmsSpa.gf
View File

@@ -369,25 +369,28 @@ oper
makeNP x g n = {s = (pn2np (mk2PN x g)).s; a = agrP3 g n ; hasClit = False ; isPol = False ; isNeg = False} ** {lock_NP = <>} ; makeNP x g n = {s = (pn2np (mk2PN x g)).s; a = agrP3 g n ; hasClit = False ; isPol = False ; isNeg = False} ** {lock_NP = <>} ;
mk7A a b c d e f g = mk7A a b c d e f g =
compADeg {s = \\_ => (mkAdj a b c d e f g).s ; isPre = False ; copTyp = serCopula ; lock_A = <>} ; compADeg (mkAdj a b c d e f g) ;
mk5A a b c d e = mk7A a a b b c d e ; mk5A a b c d e = mk7A a a b b c d e ;
mk2A a b = compADeg {s = \\_ => (adjEspanol a b).s ; isPre = False ; copTyp = serCopula ; lock_A = <>} ; mk2A a b = compADeg (adjEspanol a b) ;
regA a = compADeg {s = \\_ => (mkAdjReg a).s ; isPre = False ; copTyp = serCopula ; lock_A = <>} ; regA a = compADeg (mkAdjReg a) ;
adjCopula a cop = a ** {copTyp = cop} ; adjCopula a cop = a ** {copTyp = cop} ;
prefA a = {s = a.s ; isPre = True ; copTyp = a.copTyp ; lock_A = <>} ; prefA a = a ** {isPre = True} ;
mkA2 a p = a ** {c2 = p ; lock_A2 = <>} ; mkA2 a p = lin A2 (a ** {c2 = p}) ;
mkADeg a b = mkADeg a b = a ** {
{s = table {Posit => a.s ! Posit ; _ => b.s ! Posit} ; compar = \\num => b.s ! AF Masc num ; -- mejor, mejores
isPre = a.isPre ; copTyp = a.copTyp ; lock_A = <>} ; isDeg = True } ;
compADeg a = compADeg a = lin A
{s = table {Posit => a.s ! Posit ; _ => \\f => "más" ++ a.s ! Posit ! f} ; {s = a.s ;
isPre = a.isPre ; copTyp = a.copTyp ; compar = \\_ => nonExist ; --
lock_A = <>} ; isPre = False ; -- default values
copTyp = serCopula ;
isDeg = False
} ;
regADeg a = compADeg (regA a) ; regADeg a = compADeg (regA a) ;
mkAdv x = ss x ** {lock_Adv = <>} ; mkAdv x = ss x ** {lock_Adv = <>} ;
@@ -544,7 +547,7 @@ oper
mkA : (_,_,_,_,_,_,_ : Str) -> A = mk7A ; mkA : (_,_,_,_,_,_,_ : Str) -> A = mk7A ;
mkA : (bueno : A) -> (mejor : A) -> A = mkADeg ; mkA : (bueno : A) -> (mejor : A) -> A = mkADeg ;
mkA : (blanco : A) -> (hueso : Str) -> A = \blanco,hueso -> blanco ** mkA : (blanco : A) -> (hueso : Str) -> A = \blanco,hueso -> blanco **
{ s = \\x,y => blanco.s ! x ! y ++ hueso } ; { s = \\x => blanco.s ! x ++ hueso } ;
mkA : A -> CopulaType -> A = mkA : A -> CopulaType -> A =
adjCopula ; adjCopula ;
} ; } ;
@@ -555,7 +558,7 @@ oper
regA : Str -> A ; regA : Str -> A ;
adjCopula : A -> CopulaType -> A ; adjCopula : A -> CopulaType -> A ;
mkADeg : A -> A -> A ; mkADeg : A -> A -> A ;
compADeg : A -> A ; compADeg : Adj -> A ;
regADeg : Str -> A ; regADeg : Str -> A ;
prefA : A -> A ; prefA : A -> A ;
prefixA = prefA ; prefixA = prefA ;
@@ -582,6 +585,4 @@ oper
mk2V2 : V -> Prep -> V2 ; mk2V2 : V -> Prep -> V2 ;
dirV2 : V -> V2 ; dirV2 : V -> V2 ;
} ; } ;