GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-26 03:08:55 -06:00
Code Issues Packages Projects Releases Wiki 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 dd78657191
commit 996e0141e2
20 changed files with 98 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/swedish/ExtraSwe.gf
View File

@@ -90,7 +90,7 @@ lin
verb = mkClause subj agr (predV do_V) ;
comp = vp.n2 ! agr ++ vp.a2 ++ vp.ext
in
vf ++ comp ++ (verb.s ! t ! a ! p ! Inv) ++ vp.a1 ! Pos
vf ++ comp ++ (verb.s ! t ! a ! p ! Inv) ++ vp.a1 ! Pos ! agr
} ;
oper do_V : V = mkV "göra" "gör" "gör" "gjorde" "gjort" "gjord" ;
@@ -110,7 +110,7 @@ lin
let vps = vp.s ! Act ! VPInfinit Simul ;
vvp = UseV vv ;
vvs = vvp.s ! Act ! VPFinite t a ;
always = vp.a1 ! Pos ++ vvp.a1 ! Pos ;
always = vp.a1 ! Pos ! np.a ++ vvp.a1 ! Pos ! np.a ;
already = vp.a2 ++ vvp.a2 in
vps.inf ++ vp.n2 ! np.a ++ vvs.fin ++ np.s ! NPNom
++ vv.c2.s ++ always ++ negation ! p ++ already ++ vvs.inf
@@ -150,7 +150,7 @@ lin
SupCl np vp pol = let sub = np.s ! nominative ; --# notpresent
verb = (vp.s ! Act ! VPFinite SPres Anter).inf ; --# notpresent
neg = vp.a1 ! pol.p ++ pol.s ; --# notpresent
neg = vp.a1 ! pol.p ! np.a ++ pol.s ; --# notpresent
compl = vp.n2 ! np.a ++ vp.a2 ++ vp.ext in --# notpresent
{s = \\_ => sub ++ neg ++ verb ++ compl }; --# notpresent

14
lib/src/swedish/IdiomSwe.gf
View File

@@ -55,6 +55,20 @@ concrete IdiomSwe of Idiom = CatSwe **
ImpPl1 vp = {s = ["låt oss"] ++ infVP vp {g = Utr ; n = Pl ; p = P1}} ;
SelfAdvVP vp = insertObj (\\a => sjalv a.g a.n) vp ;
SelfAdVVP vp = insertAdVAgr (\\a => sjalv a.g a.n) vp ;
SelfNP np = {
s = \\c => np.s ! c ++ sjalv np.a.g np.a.n ;
a = np.a
} ;
oper
sjalv : Gender -> Number -> Str = \g,n -> case <g,n> of {
<Utr,Sg> => "själv" ;
<Neutr,Sg> => "självt" ;
_ => "själva"
} ;
}

2
lib/src/swedish/ParseSwe.gf
View File

@@ -12,7 +12,7 @@ concrete ParseSwe of ParseEngAbs =
SentenceSwe,
QuestionSwe,
RelativeSwe,
IdiomSwe [NP, VP, Tense, Cl, ProgrVP, ExistNP],
IdiomSwe [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP],
ExtraSwe [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash,
Temp, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP,
VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV,