GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-16 14:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

missing rule: Verb.VPSlashPrep, implemented in Eng Scand Ger. Also helped detect a bug and its fix in object insertion in Eng and Scand, which had caused wrong word orders in Verb.Slash2V3 (*he gave to me it). Fix remains to do in Ger, and also the new rule in other languages.

Browse Source
This commit is contained in:
aarne
2012-09-22 21:35:28 +00:00
parent f79838c299
commit 2149c26da2
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/src/english/VerbEng.gf
View File

@@ -1,4 +1,4 @@
concrete VerbEng of Verb = CatEng ** open ResEng in {
concrete VerbEng of Verb = CatEng ** open ResEng, Prelude in {
flags optimize=all_subs ;
@@ -7,7 +7,7 @@ concrete VerbEng of Verb = CatEng ** open ResEng in {
SlashV2a v = predVc v ;
Slash2V3 v np =
insertObjc (\\_ => v.c2 ++ np.s ! NPAcc) (predV v ** {c2 = v.c3}) ;
insertObjc (\\_ => v.c2 ++ np.s ! NPAcc) (predV v ** {c2 = v.c3 ; gapInMiddle = False}) ;
Slash3V3 v np =
insertObjc (\\_ => v.c3 ++ np.s ! NPAcc) (predVc v) ; ----
@@ -21,23 +21,26 @@ concrete VerbEng of Verb = CatEng ** open ResEng in {
SlashV2Q v q = insertObjc (\\_ => q.s ! QIndir) (predVc v) ;
SlashV2A v ap = insertObjc (\\a => ap.s ! a) (predVc v) ; ----
ComplSlash vp np = insertObjPre (\\_ => vp.c2 ++ np.s ! NPAcc) vp ;
ComplSlash vp np = case vp.gapInMiddle of {
True => insertObjPre (\\_ => vp.c2 ++ np.s ! NPAcc) vp ;
False => insertObj (\\_ => vp.c2 ++ np.s ! NPAcc) vp
} ;
SlashVV vv vp =
insertObj (\\a => infVP vv.typ vp Simul CPos a) (predVV vv) **
{c2 = vp.c2} ;
{c2 = vp.c2 ; gapInMiddle = vp.gapInMiddle} ;
SlashV2VNP vv np vp =
insertObjPre (\\_ => vv.c2 ++ np.s ! NPAcc)
(insertObjc (\\a => vv.c3 ++ infVP vv.typ vp Simul CPos a) (predVc vv)) **
{c2 = vp.c2} ;
{c2 = vp.c2 ; gapInMiddle = vp.gapInMiddle} ;
UseComp comp = insertObj comp.s (predAux auxBe) ;
AdvVP vp adv = insertObj (\\_ => adv.s) vp ;
AdVVP adv vp = insertAdV adv.s vp ;
AdvVPSlash vp adv = insertObj (\\_ => adv.s) vp ** {c2 = vp.c2} ;
AdVVPSlash adv vp = insertAdV adv.s vp ** {c2 = vp.c2} ;
AdvVPSlash vp adv = insertObj (\\_ => adv.s) vp ** {c2 = vp.c2 ; gapInMiddle = vp.gapInMiddle} ;
AdVVPSlash adv vp = insertAdV adv.s vp ** {c2 = vp.c2 ; gapInMiddle = vp.gapInMiddle} ;
ReflVP v = insertObjPre (\\a => v.c2 ++ reflPron ! a) v ;
@@ -56,4 +59,6 @@ concrete VerbEng of Verb = CatEng ** open ResEng in {
UseCopula = predAux auxBe ;
VPSlashPrep vp p = vp ** {c2 = p.s ; gapInMiddle = False} ;
}