diff --git a/lib/resource/exper/abstract/Backward.gf b/lib/resource/exper/abstract/Backward.gf index 3654b1281..3b56d6334 100644 --- a/lib/resource/exper/abstract/Backward.gf +++ b/lib/resource/exper/abstract/Backward.gf @@ -2,6 +2,12 @@ abstract Backward = Cat ** { + +-- from Cat + +cat + Slash ; + fun -- from Verb 19/4/2008 @@ -13,6 +19,8 @@ fun ComplV2Q : V2Q -> NP -> QS -> VP ; -- ask me who came ComplV2A : V2A -> NP -> AP -> VP ; -- paint it red + ReflV2 : V2 -> VP ; -- use itself + -- from Sentence 19/4/2008 SlashV2 : NP -> V2 -> Slash ; -- (whom) he sees diff --git a/lib/resource/exper/abstract/Cat.gf b/lib/resource/exper/abstract/Cat.gf index 35e59d78a..450d88316 100644 --- a/lib/resource/exper/abstract/Cat.gf +++ b/lib/resource/exper/abstract/Cat.gf @@ -31,7 +31,7 @@ abstract Cat = Common ** { QS ; -- question e.g. "where did she live" RS ; -- relative e.g. "in which she lived" Cl ; -- declarative clause, with all tenses e.g. "she looks at this" - Slash ; -- clause missing NP (S/NP in GPSG) e.g. "she looks at" + ClSlash;-- clause missing NP (S/NP in GPSG) e.g. "she looks at" SSlash ;-- sentence missing NP e.g. "she has looked at" Imp ; -- imperative e.g. "look at this" diff --git a/lib/resource/exper/abstract/Question.gf b/lib/resource/exper/abstract/Question.gf index 1898c46f2..d389780c3 100644 --- a/lib/resource/exper/abstract/Question.gf +++ b/lib/resource/exper/abstract/Question.gf @@ -8,7 +8,7 @@ abstract Question = Cat ** { fun QuestCl : Cl -> QCl ; -- does John walk QuestVP : IP -> VP -> QCl ; -- who walks - QuestSlash : IP -> Slash -> QCl ; -- who does John love + QuestSlash : IP -> ClSlash -> QCl ; -- who does John love QuestIAdv : IAdv -> Cl -> QCl ; -- why does John walk QuestIComp : IComp -> NP -> QCl ; -- where is John diff --git a/lib/resource/exper/abstract/Relative.gf b/lib/resource/exper/abstract/Relative.gf index 6a55f67e0..0926af254 100644 --- a/lib/resource/exper/abstract/Relative.gf +++ b/lib/resource/exper/abstract/Relative.gf @@ -14,7 +14,7 @@ abstract Relative = Cat ** { -- with a missing noun phrase (formed in [``Sentence`` Sentence.html]). RelVP : RP -> VP -> RCl ; -- who loves John - RelSlash : RP -> Slash -> RCl ; -- whom John loves + RelSlash : RP -> ClSlash -> RCl ; -- whom John loves -- Relative pronouns are formed from an 'identity element' by prefixing -- or suffixing (depending on language) prepositional phrases. diff --git a/lib/resource/exper/abstract/Sentence.gf b/lib/resource/exper/abstract/Sentence.gf index 7541a2976..ea8e4e455 100644 --- a/lib/resource/exper/abstract/Sentence.gf +++ b/lib/resource/exper/abstract/Sentence.gf @@ -28,10 +28,10 @@ abstract Sentence = Cat ** { -- the style of CCG. -- *Note* the set is not complete and lacks e.g. verbs with more than 2 places. - SlashVP : NP -> VPSlash -> Slash ; -- (whom) he sees - AdvSlash : Slash -> Adv -> Slash ; -- (whom) he sees tomorrow - SlashPrep : Cl -> Prep -> Slash ; -- (with whom) he walks - SlashVS : NP -> VS -> SSlash -> Slash ; -- (whom) he says that she loves + SlashVP : NP -> VPSlash -> ClSlash ; -- (whom) he sees + AdvSlash : ClSlash -> Adv -> ClSlash ; -- (whom) he sees tomorrow + SlashPrep : Cl -> Prep -> ClSlash ; -- (with whom) he walks + SlashVS : NP -> VS -> SSlash -> ClSlash ; -- (whom) he says that she loves --2 Imperatives @@ -60,7 +60,7 @@ abstract Sentence = Cat ** { UseCl : Tense -> Ant -> Pol -> Cl -> S ; UseQCl : Tense -> Ant -> Pol -> QCl -> QS ; UseRCl : Tense -> Ant -> Pol -> RCl -> RS ; - UseSlash : Tense -> Ant -> Pol -> Slash -> SSlash ; + UseSlash : Tense -> Ant -> Pol -> ClSlash -> SSlash ; -- An adverb can be added to the beginning of a sentence. diff --git a/lib/resource/exper/abstract/Verb.gf b/lib/resource/exper/abstract/Verb.gf index 99c410567..548d6ccad 100644 --- a/lib/resource/exper/abstract/Verb.gf +++ b/lib/resource/exper/abstract/Verb.gf @@ -34,8 +34,8 @@ abstract Verb = Cat ** { -- Verb phrases can also be constructed reflexively and from -- copula-preceded complements. - ReflV2 : V2 -> VP ; -- use itself - UseComp : Comp -> VP ; -- be warm + ReflVP : VPSlash -> VP ; -- use itself + UseComp : Comp -> VP ; -- be warm -- Passivization of two-place verbs is another way to use -- them. In many languages, the result is a participle that diff --git a/lib/resource/exper/english/BackwardEng.gf b/lib/resource/exper/english/BackwardEng.gf index 95f922c00..630626f0b 100644 --- a/lib/resource/exper/english/BackwardEng.gf +++ b/lib/resource/exper/english/BackwardEng.gf @@ -24,6 +24,8 @@ concrete BackwardEng of Backward = CatEng ** open ResEng in { ComplV2A v np ap = insertObj (\\_ => v.c2 ++ np.s ! Acc ++ ap.s ! np.a) (predV v) ; + ReflV2 v = insertObj (\\a => v.c2 ++ reflPron ! a) (predV v) ; + -- from Sentence 19/4/2008 SlashV2 np v2 = diff --git a/lib/resource/exper/english/CatEng.gf b/lib/resource/exper/english/CatEng.gf index 14103a012..6e9f1aded 100644 --- a/lib/resource/exper/english/CatEng.gf +++ b/lib/resource/exper/english/CatEng.gf @@ -14,7 +14,7 @@ concrete CatEng of Cat = CommonX ** open ResEng, Prelude in { -- Sentence Cl = {s : ResEng.Tense => Anteriority => CPolarity => Order => Str} ; - Slash = { + ClSlash = { s : ResEng.Tense => Anteriority => CPolarity => Order => Str ; c2 : Str } ; diff --git a/lib/resource/exper/english/VerbEng.gf b/lib/resource/exper/english/VerbEng.gf index 6a65e6533..28d969104 100644 --- a/lib/resource/exper/english/VerbEng.gf +++ b/lib/resource/exper/english/VerbEng.gf @@ -37,7 +37,7 @@ concrete VerbEng of Verb = CatEng ** open ResEng in { AdVVP adv vp = insertAdV adv.s vp ; - ReflV2 v = insertObj (\\a => v.c2 ++ reflPron ! a) (predV v) ; + ReflVP v = insertObjPre (\\a => v.c2 ++ reflPron ! a) v ; PassV2 v = insertObj (\\_ => v.s ! VPPart) (predAux auxBe) ;