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

added voice parameter to Scandinavian VP to enable PassVPSlash with the s-passive; some additions and corrections in DictEngSwe

Browse Source
This commit is contained in:
aarne
2013-11-07 21:41:58 +00:00
parent 6729cca568
commit eaab0660bd
7 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ lin
lin
--TODO: fix this; just wrote something that it compiles and doesn't give [PassVPSlash] when parsing text
PassVPSlash vps =
insertObj (\\a => vps.c2.s ++ vps.n3 ! a) vps ;
insertObj (\\a => vps.c2.s ++ vps.n3 ! a) (passiveVP vps) ;
RelVS s rvs = {s = \\o => s.s ! o ++ "," ++ rvs.s ! agrP3 Neutr Sg ! RPrep True} ;
@@ -40,8 +40,8 @@ lin
{s = \\ag,rc => t.s ++ p.s ++ vilket ++ cl.s ! t.t ! t.a ! p.p ! Sub } ;
AdvFocVP adv vp = {s = \\vpf => {fin = adv.s ++ (vp.s ! vpf).fin ;
inf = (vp.s ! vpf).inf};
AdvFocVP adv vp = {s = \\v,vpf => {fin = adv.s ++ (vp.s ! v ! vpf).fin ;
inf = (vp.s ! v ! vpf).inf};
a1 = vp.a1 ; n2 = vp.n2 ; a2 = vp.a2 ; ext = vp.ext ;
en2 = vp.en2 ; ea2 = vp.ea2; eext = vp.eext } ;
PredetAdvF adv = {s = \\_,_ => adv.s ; p = [] ; a = PNoAg} ;
@@ -77,14 +77,14 @@ lin
let
subj = np.s ! CommonScand.nominative ;
agr = np.a ;
vps = vp.s ! VPFinite t a ;
vps = vp.s ! Act ! VPFinite t a ;
vf = case <<t,a> : STense * Anteriority> of {
<SPres,Simul> => vps.fin
;<SPast,Simul> => vps.fin; --# notpresent
<_ ,Simul> => vps.inf; --# notpresent
<SPres,Anter> => vps.inf; --# notpresent
<SPast,Anter> => vps.inf; --# notpresent
<_ ,Anter> => (vp.s ! VPFinite SPast Anter).inf --# notpresent
<_ ,Anter> => (vp.s ! Act ! VPFinite SPast Anter).inf --# notpresent
};
verb = mkClause subj agr (predV do_V) ;
comp = vp.n2 ! agr ++ vp.a2 ++ vp.ext
@@ -98,7 +98,7 @@ lin
FocAP ap np =
{s = \\t,a,p =>
let vp = UseComp ap ;
vps = vp.s ! VPFinite t a;
vps = vp.s ! Act ! VPFinite t a;
npAgr = np.a in
vp.n2 ! npAgr ++ vps.fin ++ np.s ! NPNom
++ negation ! p++ vps.inf };
@@ -106,9 +106,9 @@ lin
FocVV vv vp np =
{s = \\t,a,p =>
let vps = vp.s ! VPInfinit Simul ;
let vps = vp.s ! Act ! VPInfinit Simul ;
vvp = UseV vv ;
vvs = vvp.s ! VPFinite t a ;
vvs = vvp.s ! Act ! VPFinite t a ;
always = vp.a1 ! Pos ++ vvp.a1 ! Pos ;
already = vp.a2 ++ vvp.a2 in
vps.inf ++ vp.n2 ! np.a ++ vvs.fin ++ np.s ! NPNom
@@ -148,13 +148,13 @@ lin
SupCl np vp pol = let sub = np.s ! nominative ; --# notpresent
verb = (vp.s ! VPFinite SPres Anter).inf ; --# notpresent
verb = (vp.s ! Act ! VPFinite SPres Anter).inf ; --# notpresent
neg = vp.a1 ! pol.p ++ pol.s ; --# notpresent
compl = vp.n2 ! np.a ++ vp.a2 ++ vp.ext in --# notpresent
{s = \\_ => sub ++ neg ++ verb ++ compl }; --# notpresent
PassV2 v2 = predV (depV v2);
PassV2 v2 = predV (depV (lin V v2));
PassV2Be v = insertObj
(\\a => v.s ! VI (VPtPret (agrAdjNP a DIndef) Nom))