mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-23 03:32:51 -06:00
top-level access to contracted auxiliaries in ExtraEng. Introduced them as variants in ParseEng.
This commit is contained in:
@@ -179,7 +179,9 @@ lin
|
|||||||
ComplBareVS v s = insertExtra s.s (predV v) ;
|
ComplBareVS v s = insertExtra s.s (predV v) ;
|
||||||
SlashBareV2S v s = insertExtrac s.s (predVc v) ;
|
SlashBareV2S v s = insertExtrac s.s (predVc v) ;
|
||||||
|
|
||||||
|
ContractedUseCl t p cl = {
|
||||||
|
s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! ODir True
|
||||||
|
} ;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,11 @@ abstract ExtraEngAbs = Extra - [ProDrop] ** {
|
|||||||
--- AR 7/3/2013
|
--- AR 7/3/2013
|
||||||
ComplSlashPartLast : VPSlash -> NP -> VP ;
|
ComplSlashPartLast : VPSlash -> NP -> VP ;
|
||||||
|
|
||||||
---------------------
|
--- AR 3/12/2013 ---- TODO: the same for QCl, RCl
|
||||||
|
ContractedUseCl : Temp -> Pol -> Cl -> S ; -- he's here, I'll be back
|
||||||
|
|
||||||
|
|
||||||
|
-----------------------------------------------------
|
||||||
--- these are obsolete: use UncNeg : Pol instead
|
--- these are obsolete: use UncNeg : Pol instead
|
||||||
|
|
||||||
fun
|
fun
|
||||||
@@ -38,7 +42,7 @@ abstract ExtraEngAbs = Extra - [ProDrop] ** {
|
|||||||
|
|
||||||
UncNegImpSg : Pol -> Imp -> Utt; -- do not help yourself
|
UncNegImpSg : Pol -> Imp -> Utt; -- do not help yourself
|
||||||
UncNegImpPl : Pol -> Imp -> Utt; -- do not help yourselves
|
UncNegImpPl : Pol -> Imp -> Utt; -- do not help yourselves
|
||||||
|
-----------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ concrete ParseEng of ParseEngAbs =
|
|||||||
VerbEng - [SlashV2V, PassV2, UseCopula, ComplVV],
|
VerbEng - [SlashV2V, PassV2, UseCopula, ComplVV],
|
||||||
AdverbEng,
|
AdverbEng,
|
||||||
PhraseEng,
|
PhraseEng,
|
||||||
SentenceEng,
|
SentenceEng - [UseCl], -- replaced by UseCl | ContractedUseCl
|
||||||
QuestionEng,
|
QuestionEng,
|
||||||
RelativeEng,
|
RelativeEng,
|
||||||
IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP],
|
IdiomEng [NP, VP, Tense, Cl, ProgrVP, ExistNP],
|
||||||
@@ -21,11 +21,15 @@ concrete ParseEng of ParseEngAbs =
|
|||||||
ClSlash, RCl, EmptyRelSlash, VS, V2S, ComplBareVS, SlashBareV2S],
|
ClSlash, RCl, EmptyRelSlash, VS, V2S, ComplBareVS, SlashBareV2S],
|
||||||
|
|
||||||
DictEng **
|
DictEng **
|
||||||
open MorphoEng, ResEng, ParadigmsEng, Prelude in {
|
open MorphoEng, ResEng, ParadigmsEng, (S = SentenceEng), (E = ExtraEng), Prelude in {
|
||||||
|
|
||||||
flags
|
flags
|
||||||
literal=Symb ;
|
literal=Symb ;
|
||||||
|
|
||||||
|
-- exceptional linearizations
|
||||||
|
lin
|
||||||
|
UseCl t p cl = S.UseCl t p cl | E.ContractedUseCl t p cl ;
|
||||||
|
|
||||||
lin
|
lin
|
||||||
myself_NP = regNP "myself" singular ;
|
myself_NP = regNP "myself" singular ;
|
||||||
yourselfSg_NP = regNP "yourself" singular ;
|
yourselfSg_NP = regNP "yourself" singular ;
|
||||||
@@ -147,8 +151,7 @@ lin
|
|||||||
|
|
||||||
lin
|
lin
|
||||||
PPos = {s = [] ; p = CPos} ;
|
PPos = {s = [] ; p = CPos} ;
|
||||||
PNeg = {s = [] ; p = CNeg True} ; -- contracted: don't
|
PNeg = {s = [] ; p = CNeg True} | {s = [] ; p = CNeg False} ;
|
||||||
UncNeg = {s = [] ; p = CNeg False} ;
|
|
||||||
|
|
||||||
lincat
|
lincat
|
||||||
Feat = Str;
|
Feat = Str;
|
||||||
|
|||||||
Reference in New Issue
Block a user