1
0
forked from GitHub/gf-rgl

(Por) minor updates

- correction in Lexicon
- documentation in Morpho
- rm variants from Structural
This commit is contained in:
odanoburu
2018-05-15 15:38:54 -03:00
parent 7c33881e98
commit dc9aa488a3
3 changed files with 17 additions and 15 deletions

View File

@@ -281,8 +281,8 @@ lin
kill_V2 = dirV2 (mkV "matar") ; kill_V2 = dirV2 (mkV "matar") ;
know_V2 = mkV2 (mkV "conhecer") ; know_V2 = mkV2 (mkV "conhecer") ;
learn_V2 = dirV2 (mkV "aprender") ; learn_V2 = dirV2 (mkV "aprender") ;
leave_V2 = dirV2 (mkV "partir") ; -- irse, dejar leave_V2 = dirV2 (mkV "partir") ;
like_V2 = dirV2 (mkV "gostar") ; like_V2 = mkV2 (mkV "gostar") genitive ;
listen_V2 = dirV2 (mkV "escutar") ; listen_V2 = dirV2 (mkV "escutar") ;
lose_V2 = dirV2 (mkV (perder_44 "perder")) ; lose_V2 = dirV2 (mkV (perder_44 "perder")) ;
love_V2 = dirV2 (mkV "amar") ; love_V2 = dirV2 (mkV "amar") ;

View File

@@ -210,8 +210,11 @@ oper
hasClit = True ; isPol = False hasClit = True ; isPol = False
} ** pronLin ele o lhe Ele ; } ** pronLin ele o lhe Ele ;
pronLin : (_,_,_,_ : Str) -> {s : Case => {c1,c2,comp,ton : Str}} pronLin : (_,_,_,_ : Str) -> {s : Case => {c1,c2,comp,ton : Str}} ;
= \você, o, lhe, Você -> -- change pronoun's linearizations without changing its agreement
-- features (doesn't change possessive linearizations either). e.g.,
-- he_Pron -> you_Pron
pronLin = \você, o, lhe, Você ->
let let
aVocê : Case -> Str = \x -> prepCase x ++ Você ; aVocê : Case -> Str = \x -> prepCase x ++ Você ;
in in
@@ -223,11 +226,15 @@ oper
} }
} ; } ;
pronAgr : Pronoun -> Gender -> Number -> Person -> Pronoun pronAgr : Pronoun -> Gender -> Number -> Person -> Pronoun ;
= \pron, g, n, p -> pron ** {a = Ag g n p} ; -- change a pronoun's agreement features without changing its
-- linearization field (e.g., You_Pron -> YouFem_Pron)
pronAgr = \pron, g, n, p -> pron ** {a = Ag g n p} ;
mkPronFrom : Pronoun -> (_,_,_,_ : Str) -> Gender -> Number -> Person mkPronFrom : Pronoun -> (_,_,_,_ : Str) -> Gender -> Number -> Person
-> Pronoun = \pron, você, o, lhe, Você, g, n, p -> -> Pronoun ;
-- change everything in a pronoun but its possessive linearizations
mkPronFrom = \pron, você, o, lhe, Você, g, n, p ->
(pronAgr pron g n p) ** pronLin você o lhe Você ; (pronAgr pron g n p) ** pronLin você o lhe Você ;

View File

@@ -24,7 +24,9 @@ concrete StructuralPor of Structural = CatPor **
"ela" "a" "lhe" "ela" "ela" "a" "lhe" "ela"
Fem Sg P3 ; Fem Sg P3 ;
youSg_Pron = he_Pron ** pronLin "você" "te" "lhe" "você" ; youSg_Pron = he_Pron ** pronLin "você" "te" "lhe" "você" ;
youPol_Pron = youPlPol_Pron | youSgPol_Pron ; youPol_Pron = mkPronoun "tu" "te" "te" "ti"
"teu" "tua" "teus" "tuas"
Masc Sg P2 ;
we_Pron = we_Pron =
mkPronoun mkPronoun
"nós" "nos" "nos" "nós" "nosso" "nossa" "nossos" "nossas" "nós" "nos" "nos" "nós" "nosso" "nossa" "nossos" "nossas"
@@ -158,13 +160,6 @@ concrete StructuralPor of Structural = CatPor **
-- is it still necessary after deleting the Spa confusion? y/e -- is it still necessary after deleting the Spa confusion? y/e
etConj : {s : Str ; n : MorphoPor.Number} = {s = "e"} ** {n = Pl} ; etConj : {s : Str ; n : MorphoPor.Number} = {s = "e"} ** {n = Pl} ;
youSgPol_Pron : Pronoun =
mkPronoun "tu" "te" "te" "ti" "teu" "tua" "teus" "tuas"
Masc Sg P2 ;
youPlPol_Pron : Pronoun =
mkPronoun "vós" "vos" "vos" "vós"
"vosso" "vossa" "vossos" "vossas"
Masc Pl P2 ;
lin lin
as_CAdv = X.mkCAdv "tão" conjThan ; ---- as_CAdv = X.mkCAdv "tão" conjThan ; ----
have_V2 = dirV2 (mkV (ter_1 "ter")) ; have_V2 = dirV2 (mkV (ter_1 "ter")) ;