mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-29 06:22:51 -06:00
fused Conj and DConj in exper
This commit is contained in:
@@ -98,7 +98,7 @@ abstract Cat = Common ** {
|
||||
-- Constructed in [Structural Structural.html].
|
||||
|
||||
Conj ; -- conjunction e.g. "and"
|
||||
DConj ; -- distributed conjunction e.g. "both - and"
|
||||
---b DConj ; -- distributed conjunction e.g. "both - and"
|
||||
Subj ; -- subjunction e.g. "if"
|
||||
Prep ; -- preposition, or just case e.g. "in"
|
||||
|
||||
|
||||
@@ -22,10 +22,10 @@ abstract Conjunction = Cat ** {
|
||||
ConjNP : Conj -> [NP] -> NP ; -- "she or we"
|
||||
ConjAdv : Conj -> [Adv] -> Adv ; -- "here or there"
|
||||
|
||||
DConjS : DConj -> [S] -> S ; -- "either he walks or she runs"
|
||||
DConjAP : DConj -> [AP] -> AP ; -- "both warm and cold"
|
||||
DConjNP : DConj -> [NP] -> NP ; -- "either he or she"
|
||||
DConjAdv : DConj -> [Adv] -> Adv; -- "both here and there"
|
||||
---b DConjS : DConj -> [S] -> S ; -- "either he walks or she runs"
|
||||
---b DConjAP : DConj -> [AP] -> AP ; -- "both warm and cold"
|
||||
---b DConjNP : DConj -> [NP] -> NP ; -- "either he or she"
|
||||
---b DConjAdv : DConj -> [Adv] -> Adv; -- "both here and there"
|
||||
|
||||
--2 Categories
|
||||
|
||||
|
||||
@@ -24,14 +24,16 @@ abstract Structural = Cat ** {
|
||||
before_Prep : Prep ;
|
||||
behind_Prep : Prep ;
|
||||
between_Prep : Prep ;
|
||||
both7and_DConj : DConj ;
|
||||
both7and_DConj : Conj ;
|
||||
---b both7and_DConj : DConj ;
|
||||
but_PConj : PConj ;
|
||||
by8agent_Prep : Prep ;
|
||||
by8means_Prep : Prep ;
|
||||
can8know_VV : VV ;
|
||||
can_VV : VV ;
|
||||
during_Prep : Prep ;
|
||||
either7or_DConj : DConj ;
|
||||
either7or_DConj : Conj ;
|
||||
---b either7or_DConj : DConj ;
|
||||
every_Det : Det ;
|
||||
everybody_NP : NP ;
|
||||
everything_NP : NP ;
|
||||
|
||||
Reference in New Issue
Block a user