mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-06-25 02:56:28 -06:00
Merge remote-tracking branch 'origin/master' into new-VPS2-extend
This commit is contained in:
@@ -13,6 +13,7 @@ fun
|
||||
InflectionN : N -> Inflection ;
|
||||
InflectionN2 : N2 -> Inflection ;
|
||||
InflectionN3 : N3 -> Inflection ;
|
||||
InflectionPN : PN -> Inflection ;
|
||||
InflectionA : A -> Inflection ;
|
||||
InflectionA2 : A2 -> Inflection ;
|
||||
InflectionV : V -> Inflection ;
|
||||
@@ -27,6 +28,9 @@ fun
|
||||
InflectionV2Q : V2Q -> Inflection ;
|
||||
InflectionV2A : V2A -> Inflection ;
|
||||
InflectionAdv : Adv -> Inflection ;
|
||||
InflectionAdV : AdV -> Inflection ;
|
||||
InflectionAdA : AdA -> Inflection ;
|
||||
InflectionAdN : AdN -> Inflection ;
|
||||
InflectionPrep : Prep -> Inflection ;
|
||||
|
||||
fun
|
||||
|
||||
@@ -75,6 +75,14 @@ abstract Extend = Cat ** {
|
||||
ConjVPI2 : Conj -> [VPI2] -> VPI2 ; -- to love and hate
|
||||
ComplVPI2 : VPI2 -> NP -> VPI ; -- to love and hate that person
|
||||
|
||||
-- Conjunction of copula complements
|
||||
cat [Comp]{2} ;
|
||||
fun ConjComp : Conj -> ListComp -> Comp ;
|
||||
|
||||
-- Conjunction of imperatives
|
||||
cat [Imp] {2} ;
|
||||
fun ConjImp : Conj -> ListImp -> Imp ;
|
||||
|
||||
fun
|
||||
ProDrop : Pron -> Pron ; -- unstressed subject pronoun becomes empty: "am tired"
|
||||
|
||||
@@ -190,6 +198,15 @@ abstract Extend = Cat ** {
|
||||
|
||||
PredetRNP : Predet -> RNP -> RNP ; -- all my brothers
|
||||
|
||||
AdvRNP : NP -> Prep -> RNP -> RNP ; -- a dispute with his wife
|
||||
AdvRVP : VP -> Prep -> RNP -> VP ; -- lectured about her travels
|
||||
AdvRAP : AP -> Prep -> RNP -> AP ; -- adamant in his refusal
|
||||
|
||||
ReflA2RNP : A2 -> RNP -> AP ; -- indifferent to their surroundings
|
||||
-- NOTE: generalizes ReflA2
|
||||
|
||||
PossPronRNP : Pron -> Num -> CN -> RNP -> NP ; -- his abandonment of his wife and children
|
||||
|
||||
ConjRNP : Conj -> RNPList -> RNP ; -- my family, John and myself
|
||||
|
||||
Base_rr_RNP : RNP -> RNP -> RNPList ; -- my family, myself
|
||||
|
||||
@@ -40,6 +40,7 @@ abstract Sentence = Cat ** {
|
||||
-- To fix these parameters, see [Phrase Phrase.html].
|
||||
|
||||
ImpVP : VP -> Imp ; -- love yourselves
|
||||
AdvImp : Adv -> Imp -> Imp ; -- please love yourselves
|
||||
|
||||
--2 Embedded sentences
|
||||
|
||||
|
||||
Reference in New Issue
Block a user