msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

three new uses of "self" in Idion(Eng,Fin,Ger,Swe): SelfAdvVP (he is singing himself), SelfAdVVP (he is himself singing), SelfNP (he himself is singing; I know the president himself)

Browse Source
This commit is contained in:
aarne
2013-12-03 18:54:56 +00:00
parent 629efbe2c0
commit 70f8827f75
20 changed files with 98 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/english/ResEng.gf
View File

@@ -235,7 +235,7 @@ param
prp : Str ; -- present participle
ptp : Str ; -- past participle
inf : Str ; -- the infinitive form ; VerbForms would be the logical place
ad : Str ; -- sentence adverb
ad : Agr => Str ; -- sentence adverb (can be Xself, hence Agr)
s2 : Agr => Str ; -- complement
ext : Str -- extreposed field such as S, QS, VP
} ;
@@ -291,7 +291,7 @@ param
prp = verb.s ! VPresPart ;
ptp = verb.s ! VPPart ;
inf = verb.s ! VInf ;
ad = [] ;
ad = \\_ => [] ;
ext = [] ;
s2 = \\a => if_then_Str verb.isRefl (reflPron ! a) []
} ;
@@ -349,7 +349,7 @@ param
prp = verb.prpart ;
ptp = verb.ppart ;
inf = verb.inf ;
ad = [] ;
ad = \\_ => [] ;
ext = [] ;
s2 = \\_ => []
} ;
@@ -407,13 +407,15 @@ param
--- The adverb should be before the finite verb.
insertAdV : Str -> VP -> VP = \ad,vp -> {
insertAdV : Str -> VP -> VP = \ad -> insertAdVAgr (\\_ => ad) ;
insertAdVAgr : (Agr => Str) -> VP -> VP = \ad,vp -> {
s = vp.s ;
p = vp.p ;
prp = vp.prp ;
ptp = vp.ptp ;
inf = vp.inf ;
ad = vp.ad ++ ad ;
ad = \\a => vp.ad ! a ++ ad ! a ;
s2 = \\a => vp.s2 ! a ;
ext = vp.ext
} ;
@@ -459,14 +461,14 @@ param
case cb of {CPos => ""; _ => "not"} ++
case ant of {
Simul => case typ of {
VVAux => vp.ad ++ vp.inf ;
VVInf => "to" ++ vp.ad ++ vp.inf ;
_ => vp.ad ++ vp.prp
VVAux => vp.ad ! a ++ vp.inf ;
VVInf => "to" ++ vp.ad ! a ++ vp.inf ; ---- this is the "split infinitive"
_ => vp.ad ! a ++ vp.prp
}
; Anter => case typ of { --# notpresent
VVAux => "have" ++ vp.ad ++ vp.ptp ; --# notpresent
VVInf => "to" ++ "have" ++ vp.ad ++ vp.ptp ; --# notpresent
_ => "having" ++ vp.ad ++ vp.ptp --# notpresent
VVAux => "have" ++ vp.ad ! a ++ vp.ptp ; --# notpresent
VVInf => "to" ++ "have" ++ vp.ad ! a ++ vp.ptp ; --# notpresent
_ => "having" ++ vp.ad ! a ++ vp.ptp --# notpresent
} --# notpresent
} ++ vp.p ++
vp.s2 ! a ++ vp.ext ;
@@ -544,8 +546,8 @@ param
compl = vp.s2 ! agr ++ vp.ext
in
case o of {
ODir _ => subj ++ verb.aux ++ verb.adv ++ vp.ad ++ verb.fin ++ verb.inf ++ vp.p ++ compl ;
OQuest => verb.aux ++ subj ++ verb.adv ++ vp.ad ++ verb.fin ++ verb.inf ++ vp.p ++ compl
ODir _ => subj ++ verb.aux ++ verb.adv ++ vp.ad ! agr ++ verb.fin ++ verb.inf ++ vp.p ++ compl ;
OQuest => verb.aux ++ subj ++ verb.adv ++ vp.ad ! agr ++ verb.fin ++ verb.inf ++ vp.p ++ compl
}
} ;