forked from GitHub/gf-rgl
added PiedPiping to Extend and corrected the comment on RelSlash in RelativeEng
This commit is contained in:
@@ -16,7 +16,8 @@ concrete ExtendEng of Extend =
|
||||
FocusAP, FocusAdV, FocusAdv, FocusObj, GenIP, GenModIP, GenModNP, GenNP, GenRP,
|
||||
GerundAdv, GerundCN, GerundNP, IAdvAdv, ICompAP, InOrderToVP, NominalizeVPSlashNP,
|
||||
PassAgentVPSlash, PassVPSlash, ProgrVPSlash, PastPartAP, PastPartAgentAP, PositAdVAdj, PredVPSVV, PredetRNP, PrepCN,
|
||||
EmbedSSlash, PredIAdvVP, PresPartAP, PurposeVP, ReflPoss, ReflPron, ReflRNP, SlashBareV2S, SlashV2V, StrandQuestSlash, StrandRelSlash,
|
||||
EmbedSSlash, PredIAdvVP, PresPartAP, PurposeVP, ReflPoss, ReflPron, ReflRNP, SlashBareV2S, SlashV2V,
|
||||
StrandQuestSlash, StrandRelSlash, PiedPipingQuestSlash, PiedPipingRelSlash,
|
||||
UncontractedNeg, UttAccIP, UttAccNP, UttAdV, UttDatIP, UttDatNP, UttVPShort, WithoutVP, A2VPSlash, N2VPSlash,
|
||||
CardCNCard, ProDrop, theyFem_Pron, theyNeutr_Pron
|
||||
]
|
||||
@@ -50,6 +51,15 @@ concrete ExtendEng of Extend =
|
||||
GenModNP num np cn = DetCN (DetQuant (GenNP (lin NP np)) num) cn ;
|
||||
GenModIP num ip cn = IdetCN (IdetQuant (GenIP (lin IP ip)) num) cn ;
|
||||
|
||||
PiedPipingRelSlash rp slash = {
|
||||
s = \\t,a,p,agr =>
|
||||
slash.c2 ++ rp.s ! RPrep (fromAgr agr).g ++ slash.s ! t ! a ! p ! oDir ;
|
||||
c = NPAcc
|
||||
} ;
|
||||
|
||||
PiedPipingQuestSlash ip slash =
|
||||
mkQuestion (ss (slash.c2 ++ ip.s ! NPAcc)) slash ;
|
||||
|
||||
StrandQuestSlash ip slash =
|
||||
{s = \\t,a,b,q =>
|
||||
(mkQuestion (ss (ip.s ! NPAcc)) slash).s ! t ! a ! b ! q ++ slash.c2
|
||||
|
||||
@@ -21,7 +21,7 @@ concrete QuestionEng of Question = CatEng ** open ResEng, Prelude in {
|
||||
{s = \\t,a,b,q =>
|
||||
(mkQuestion (ss (ip.s ! NPAcc)) slash).s ! t ! a ! b ! q ++ slash.c2
|
||||
} ;
|
||||
--- changed AR 5/6/2016: uses stranding; pied-piping in ExtraEng
|
||||
--- changed AR 5/6/2016: uses stranding; pied-piping in ExtraEng and ExtendEng
|
||||
|
||||
QuestIAdv iadv cl = mkQuestion iadv cl ;
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ concrete RelativeEng of Relative = CatEng ** open ResEng, Prelude in {
|
||||
c = npNom
|
||||
} ;
|
||||
|
||||
-- Pied piping: "that we are looking at". Pied piping and empty
|
||||
-- relative are defined in $ExtraEng.gf$ ("at which we are looking",
|
||||
-- Preposition stranding: "that we are looking at". Pied piping and empty
|
||||
-- relative are defined in $ExtendEng.gf$ ("at which we are looking",
|
||||
-- "we are looking at").
|
||||
|
||||
RelSlash rp slash = {
|
||||
|
||||
Reference in New Issue
Block a user