GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-28 01:18:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Por) misc fixes

Browse Source 
- add n_units_of_NP
- add n_unit_CN
- refactor adjective paradigm opers
- rm identity definitions in Idiom
This commit is contained in:
odanoburu
2019-01-07 13:35:31 -02:00
parent 560f9b22c2
commit 3b55eaa89d
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/portuguese/ConstructionPor.gf
View File

@@ -17,7 +17,8 @@ lin
has_age_VP card = mkVP have_V2 (mkNP <lin Card card : Card> L.year_N) ; has_age_VP card = mkVP have_V2 (mkNP <lin Card card : Card> L.year_N) ;
have_name_Cl x y = mkCl x (mkV2 (reflV (mkV "chamar"))) y ; have_name_Cl x y = mkCl x (mkV2 (reflV (mkV "chamar"))) y ;
married_Cl x y = mkCl (lin NP x) L.married_A2 (lin NP y) | mkCl (mkNP and_Conj (lin NP x) (lin NP y)) (mkA "casado") ; married_Cl x y = mkCl (lin NP x) L.married_A2 (lin NP y)
| mkCl (mkNP and_Conj (lin NP x) (lin NP y)) (mkA "casado") ;
what_name_QCl x = mkQCl how_IAdv (mkCl (lin NP x) (reflV (mkV "chamar"))) ; what_name_QCl x = mkQCl how_IAdv (mkCl (lin NP x) (reflV (mkV "chamar"))) ;
how_old_QCl x = mkQCl (mkIP how8many_IDet L.year_N) x have_V2 ; how_old_QCl x = mkQCl (mkIP how8many_IDet L.year_N) x have_V2 ;
@@ -29,14 +30,18 @@ lin
is_right_VP = mkVP (mkVA B.estar_V) (mkAP (mkA "certo")) ; is_right_VP = mkVP (mkVA B.estar_V) (mkAP (mkA "certo")) ;
is_wrong_VP = mkVP (mkVA B.estar_V) (mkAP (mkA "errado")) ; is_wrong_VP = mkVP (mkVA B.estar_V) (mkAP (mkA "errado")) ;
n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP <lin Card card : Card> (lin CN cn)))) (lin A a) ; n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP <lin Card card : Card> (lin CN cn))))
-- n_units_of_NP card cn np = variants {} ; (lin A a) ;
-- n_unit_CN card cn cn = variants {} ; n_units_of_NP card cn np = mkNP card (mkCN (lin N2 cn) np) ;
n_unit_CN card cn cn = mkCN (invarA ("de" ++ card.s ! cn.g ++ cn.s ! card.n)) cn ;
bottle_of_CN np = mkCN (lin N2 (mkN2 (mkN "garrafa" feminine) part_Prep)) np ; bottle_of_CN np = mkCN (lin N2 (mkN2 (mkN "garrafa" feminine) part_Prep)) np ;
cup_of_CN np = mkCN (lin N2 (mkN2 (mkN "copo") part_Prep)) np ; cup_of_CN np = mkCN (lin N2 (mkN2 (mkN "copo") part_Prep)) np ;
glass_of_CN np = mkCN (lin N2 (mkN2 (mkN "taça") part_Prep)) np ; glass_of_CN np = mkCN (lin N2 (mkN2 (mkN "taça") part_Prep)) np ;
-- falta X para NP ser Y
few_X_short_of_Y np cn cn = variants {} ;
{- {-
-- spatial deixis and motion verbs -- spatial deixis and motion verbs

4
src/portuguese/IdiomPor.gf
View File

@@ -56,7 +56,7 @@ concrete IdiomPor of Idiom = CatPor **
s = "deixe" ++ (np.s ! Nom).ton ++ infVP vp np.a ; s = "deixe" ++ (np.s ! Nom).ton ++ infVP vp np.a ;
} ; } ;
SelfAdvVP vp = vp ; SelfAdvVP vp = variants {} ;
SelfAdVVP = insertComplement ( SelfAdVVP = insertComplement (
\\agr => case agr of { \\agr => case agr of {
@@ -68,6 +68,6 @@ concrete IdiomPor of Idiom = CatPor **
} }
) ; ) ;
SelfNP np = np ; SelfNP np = variants {} ;
} ; } ;

20
src/portuguese/ParadigmsPor.gf
View File

@@ -187,27 +187,24 @@ oper
--2 Adjectives --2 Adjectives
compADeg : A -> A ; compADeg : A -> A ;
compADeg a = lin A { compADeg a = a ** {
s = table { s = table {
Posit => a.s ! Posit ; Posit => a.s ! Posit ;
_ => \\f => "mais" ++ a.s ! Posit ! f _ => \\f => "mais" ++ a.s ! Posit ! f
} ; } ;
isPre = a.isPre ;
copTyp = a.copTyp
} ; } ;
liftAdj : Adj -> A ;
liftAdj adj = compADeg (lin A {s = \\_ => adj.s ; isPre = False ; copTyp = serCopula}) ;
regA : Str -> A ; regA : Str -> A ;
regA a = compADeg (lin A {s = \\_ => (mkAdjReg a).s ; isPre = False ; copTyp = serCopula}) ; regA a = liftAdj (mkAdjReg a) ;
mk2A : (único,unicamente : Str) -> A ; mk2A : (único,unicamente : Str) -> A ;
mk2A adj adv = compADeg {s = \\_ => (mkAdj2 adj adv).s ; isPre = False ; mk2A adj adv = liftAdj (mkAdj2 adj adv) ;
copTyp = serCopula ;
lock_A = <>} ;
mk5A : (preto,preta,pretos,pretas,pretamente : Str) -> A ; mk5A : (preto,preta,pretos,pretas,pretamente : Str) -> A ;
mk5A a b c d e = compADeg {s = \\_ => (mkAdj a b c d e).s ; mk5A a b c d e = liftAdj (mkAdj a b c d e) ;
isPre = False ; copTyp = serCopula ;
lock_A = <>} ;
adjCopula : A -> CopulaType -> A ; adjCopula : A -> CopulaType -> A ;
adjCopula a cop = a ** {copTyp = cop} ; adjCopula a cop = a ** {copTyp = cop} ;
@@ -224,6 +221,9 @@ oper
copTyp = a.copTyp copTyp = a.copTyp
} ; } ;
invarA : Str -> A ;
invarA a = liftAdj (adjBlu a) ;
mkNonInflectA : A -> Str -> A ; mkNonInflectA : A -> Str -> A ;
mkNonInflectA = \blanco,hueso -> blanco ** {s = \\x,y => blanco.s ! x ! y ++ hueso } ; mkNonInflectA = \blanco,hueso -> blanco ** {s = \\x,y => blanco.s ! x ! y ++ hueso } ;