mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-27 17:08:54 -06:00
Merge pull request #213 from inariksit/extend-subj-rs
(Extend) Add SubjRelNP (only relevant for Romance)
This commit is contained in:
@@ -211,6 +211,8 @@ abstract Extend = Cat ** {
|
|||||||
|
|
||||||
UseComp_estar : Comp -> VP ; -- (Cat, Spa, Por) "está cheio" instead of "é cheio"
|
UseComp_estar : Comp -> VP ; -- (Cat, Spa, Por) "está cheio" instead of "é cheio"
|
||||||
|
|
||||||
|
SubjRelNP : NP -> RS -> NP ; -- Force RS in subjunctive: lo que les *resulte* mejor
|
||||||
|
|
||||||
iFem_Pron : Pron ; -- I (Fem)
|
iFem_Pron : Pron ; -- I (Fem)
|
||||||
youFem_Pron : Pron ; -- you (Fem)
|
youFem_Pron : Pron ; -- you (Fem)
|
||||||
weFem_Pron : Pron ; -- we (Fem)
|
weFem_Pron : Pron ; -- we (Fem)
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ lin
|
|||||||
|
|
||||||
DetNPMasc = DetNP ;
|
DetNPMasc = DetNP ;
|
||||||
DetNPFem = DetNP ;
|
DetNPFem = DetNP ;
|
||||||
|
SubjRelNP = RelNP ;
|
||||||
UseComp_estar = UseComp ; -- DEFAULT UseComp
|
UseComp_estar = UseComp ; -- DEFAULT UseComp
|
||||||
iFem_Pron = i_Pron ; -- DEFAULT I (masc)
|
iFem_Pron = i_Pron ; -- DEFAULT I (masc)
|
||||||
youFem_Pron = youSg_Pron ; -- DEFAULT you (masc)
|
youFem_Pron = youSg_Pron ; -- DEFAULT you (masc)
|
||||||
|
|||||||
@@ -51,7 +51,11 @@ incomplete concrete ExtendRomanceFunctor of Extend =
|
|||||||
-- s = \\agr,t,a,p,m => cls.s ! agr ! DDir ! t ! a ! p ! m ++ cls.c2.s ;
|
-- s = \\agr,t,a,p,m => cls.s ! agr ! DDir ! t ! a ! p ! m ++ cls.c2.s ;
|
||||||
-- c = Nom
|
-- c = Nom
|
||||||
-- } ;
|
-- } ;
|
||||||
|
SubjRelNP np rs = heavyNPpol np.isNeg {
|
||||||
|
s = \\c => (np.s ! c).ton ++ rs.s ! Conjunct ! np.a ;
|
||||||
|
a = np.a ;
|
||||||
|
hasClit = False
|
||||||
|
} ;
|
||||||
lin
|
lin
|
||||||
PredVPS np vpi = {
|
PredVPS np vpi = {
|
||||||
s = \\m => (np.s ! Nom).comp ++ vpi.s ! m ! np.a ! np.isNeg
|
s = \\m => (np.s ! Nom).comp ++ vpi.s ! m ! np.a ! np.isNeg
|
||||||
|
|||||||
@@ -61,11 +61,11 @@ concrete ExtendSpa of Extend = CatSpa ** ExtendRomanceFunctor -
|
|||||||
Fem Sg P3 ;
|
Fem Sg P3 ;
|
||||||
|
|
||||||
youPolPl_Pron = mkPronoun
|
youPolPl_Pron = mkPronoun
|
||||||
"ustedes" "los" "les" "usted"
|
"ustedes" "los" "les" "ustedes"
|
||||||
"su" "su" "sus" "sus"
|
"su" "su" "sus" "sus"
|
||||||
Masc Pl P3 ;
|
Masc Pl P3 ;
|
||||||
youPolPlFem_Pron = mkPronoun
|
youPolPlFem_Pron = mkPronoun
|
||||||
"ustedes" "las" "les" "usted"
|
"ustedes" "las" "les" "ustedes"
|
||||||
"su" "su" "sus" "sus"
|
"su" "su" "sus" "sus"
|
||||||
Fem Pl P3 ;
|
Fem Pl P3 ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user