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

restored the a.s field in infinitives in PredicationSwe, needed in linearization.

Browse Source
This commit is contained in:
aarne
2014-01-29 08:02:44 +00:00
parent 65cc186f13
commit 0900ea04ed
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/src/experimental/Predication.gf
View File

@@ -8,7 +8,6 @@ cat
V Arg ; V Arg ;
VP Arg ; VP Arg ;
VPC Arg ; -- conjunction of VP VPC Arg ; -- conjunction of VP
Temp ;
Ant ; Ant ;
Tense ; Tense ;
Pol ; Pol ;
@@ -34,11 +33,9 @@ fun
PPos, PNeg : Pol ; PPos, PNeg : Pol ;
ASimul, AAnter : Ant ; ASimul, AAnter : Ant ;
TTAnt : Tense -> Ant -> Temp ; UseV : Ant -> Tense -> Pol -> (a : Arg) -> V a -> VP a ;
PassUseV : Ant -> Tense -> Pol -> (a : Arg) -> V (aNP a) -> VP a ;
UseV : Temp -> Pol -> (a : Arg) -> V a -> VP a ; AgentPassUseV : Ant -> Tense -> Pol -> (a : Arg) -> V (aNP a) -> NP -> VP a ;
PassUseV : Temp -> Pol -> (a : Arg) -> V (aNP a) -> VP a ;
AgentPassUseV : Temp -> Pol -> (a : Arg) -> V (aNP a) -> NP -> VP a ;
SlashV2 : (a : Arg) -> VP (aNP a) -> NP -> VP a ; -- consuming first NP SlashV2 : (a : Arg) -> VP (aNP a) -> NP -> VP a ; -- consuming first NP
SlashV3 : (a : Arg) -> VP (aNP (aNP a)) -> NP -> VP (aNP a) ; -- consuming second NP SlashV3 : (a : Arg) -> VP (aNP (aNP a)) -> NP -> VP (aNP a) ; -- consuming second NP
@@ -53,7 +50,7 @@ fun
SlashV2N : (a : Arg) -> VP (aNP aN) -> CN a -> VP (aNP a) ; SlashV2N : (a : Arg) -> VP (aNP aN) -> CN a -> VP (aNP a) ;
SlashV2Q : (a : Arg) -> VP (aNP aA) -> QCl a -> VP (aNP a) ; SlashV2Q : (a : Arg) -> VP (aNP aA) -> QCl a -> VP (aNP a) ;
UseAP : Temp -> Pol -> (a : Arg) -> AP a -> VP a ; UseAP : Ant -> Tense -> Pol -> (a : Arg) -> AP a -> VP a ;
PredVP : (a : Arg) -> NP -> VP a -> Cl a ; PredVP : (a : Arg) -> NP -> VP a -> Cl a ;

37
lib/src/experimental/PredicationSwe.gf
View File

@@ -77,7 +77,6 @@ lincat
c3 : ComplCase ; c3 : ComplCase ;
} ; } ;
Temp = {s : Str ; t : STense ; a : Anteriority} ;
Tense = {s : Str ; t : STense} ; Tense = {s : Str ; t : STense} ;
Ant = {s : Str ; a : Anteriority} ; Ant = {s : Str ; a : Anteriority} ;
Pol = {s : Str ; p : Polarity} ; Pol = {s : Str ; p : Polarity} ;
@@ -108,7 +107,6 @@ lin
aNone, aS, aV, aA, aQ, aN = {s = []} ; aNone, aS, aV, aA, aQ, aN = {s = []} ;
aNP a = a ; aNP a = a ;
TTAnt t a = {s = t.s ++ a.s ; t = t.t ; a = a.a} ;
TPres = {s = [] ; t = Pres} ; TPres = {s = [] ; t = Pres} ;
TPast = {s = [] ; t = Past} ; TPast = {s = [] ; t = Past} ;
TFut = {s = [] ; t = Fut} ; TFut = {s = [] ; t = Fut} ;
@@ -119,9 +117,9 @@ lin
PPos = {s = [] ; p = Pos} ; PPos = {s = [] ; p = Pos} ;
PNeg = {s = [] ; p = Neg} ; PNeg = {s = [] ; p = Neg} ;
UseV t p _ v = { UseV a t p _ v = {
v = tenseV t.s t.t t.a Act v ; v = tenseV (a.s ++ t.s) t.t a.a Act v ;
inf = tenseInfV t.s t.a Act v ; inf = tenseInfV a.s a.a Act v ;
c1 = v.c1 ; c1 = v.c1 ;
c2 = v.c2 ; c2 = v.c2 ;
adj = noObj ; adj = noObj ;
@@ -132,9 +130,9 @@ lin
ext = [] ; ext = [] ;
} ; } ;
PassUseV t p _ v = { PassUseV a t p _ v = {
v = tenseV t.s t.t t.a Pass v ; v = tenseV (a.s ++ t.s) t.t a.a Pass v ;
inf = tenseInfV t.s t.a Pass v ; inf = tenseInfV a.s a.a Pass v ;
c1 = v.c1 ; c1 = v.c1 ;
c2 = v.c2 ; c2 = v.c2 ;
adj = noObj ; adj = noObj ;
@@ -145,9 +143,9 @@ lin
ext = [] ; ext = [] ;
} ; } ;
AgentPassUseV t p _ v np = { AgentPassUseV a t p _ v np = {
v = tenseV t.s t.t t.a Pass v ; v = tenseV (a.s ++ t.s) t.t a.a Pass v ;
inf = tenseInfV t.s t.a Pass v ; inf = tenseInfV a.s a.a Pass v ;
c1 = v.c1 ; c1 = v.c1 ;
c2 = v.c2 ; c2 = v.c2 ;
adj = \\a => [] ; adj = \\a => [] ;
@@ -158,9 +156,9 @@ lin
ext = [] ; ext = [] ;
} ; } ;
UseAP t p _ ap = { UseAP a t p _ ap = {
v = tenseV t.s t.t t.a Act be_V ; v = tenseV (a.s ++ t.s) t.t a.a Act be_V ;
inf = tenseInfV t.s t.a Act be_V ; inf = tenseInfV a.s a.a Act be_V ;
c1 = ap.c1 ; c1 = ap.c1 ;
c2 = ap.c2 ; c2 = ap.c2 ;
adj = \\a => ap.s ! a ; adj = \\a => ap.s ! a ;
@@ -648,7 +646,7 @@ oper
vp.adV ++ (vp.inf.p1 | []) ++ vp.inf.p2 ++ ---- *hon tvingar oss att sovit vp.adV ++ (vp.inf.p1 | []) ++ vp.inf.p2 ++ ---- *hon tvingar oss att sovit
vp.adj ! a ++ vp.c1 ++ vp.obj1.p1 ! a ++ vp.c2 ++ vp.obj2.p1 ! a2 ++ vp.adv ++ vp.ext ; vp.adj ! a ++ vp.c1 ++ vp.obj1.p1 ! a ++ vp.c2 ++ vp.obj2.p1 ! a2 ++ vp.adv ++ vp.ext ;
tenseV : Str -> STense -> Anteriority -> Voice -> V -> Str * Str * Str = \sta,t,a,o,v -> case <t,a> of { --- sta dummy s field of Temp tenseV : Str -> STense -> Anteriority -> Voice -> V -> Str * Str * Str = \sta,t,a,o,v -> case <t,a> of { --- sta dummy s field of Ant and Tense
<Pres,Simul> => <sta ++ v.v ! TV o VPres, [], []> ; <Pres,Simul> => <sta ++ v.v ! TV o VPres, [], []> ;
<Past,Simul> => <sta ++ v.v ! TV o VPret, [], []> ; <Past,Simul> => <sta ++ v.v ! TV o VPret, [], []> ;
<Fut, Simul> => <shall_V.v ! TV Act VPres, [], sta ++ v.v ! TV o VInf> ; <Fut, Simul> => <shall_V.v ! TV Act VPres, [], sta ++ v.v ! TV o VInf> ;
@@ -659,11 +657,10 @@ oper
<Cond,Anter> => <shall_V.v ! TV Act VPret, have_V.v ! TV Act VInf, sta ++ v.v ! TV o VSup> <Cond,Anter> => <shall_V.v ! TV Act VPret, have_V.v ! TV Act VInf, sta ++ v.v ! TV o VSup>
} ; } ;
tenseInfV : Str -> Anteriority -> Voice -> V -> Str * Str = \sta,a,o,v -> tenseInfV : Str -> Anteriority -> Voice -> V -> Str * Str = \sa,a,o,v ->
let tenseMark = [] ---- sta, will produce ambiguity instead of metavariable case a of {
in case a of { Simul => <[], sa ++ v.v ! TV o VInf> ; -- hon vill sova
Simul => <[], tenseMark ++ v.v ! TV o VInf> ; -- hon vill sova Anter => <have_V.v ! TV Act VInf, sa ++ v.v ! TV o VSup> -- hon vill (ha) sovit
Anter => <have_V.v ! TV Act VInf, tenseMark ++ v.v ! TV o VSup> -- hon vill (ha) sovit
} ; } ;