GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-09 11:12:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

corrected the treatment of passives in Fin

Browse Source
This commit is contained in:
aarne
2013-12-08 14:58:29 +00:00
parent 30df21ffd8
commit a91add2bbb
7 changed files with 90 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/src/finnish/StemFin.gf
View File

@@ -177,8 +177,10 @@ oper
s2 : Bool => Polarity => Agr => Str ; -- talo/talon/taloa
adv : Polarity => Str ; -- ainakin/ainakaan
ext : Str ;
isNeg : Bool ; -- True if some complement is negative
vptyp : {isNeg : Bool ; isPass : Bool} ;-- True if some complement is negative, and if the verb is rendered in the passive
} ;
defaultVPTyp = {isNeg = False ; isPass = False} ;
HVerb : Type = Verb ** {sc : NPForm ; h : Harmony ; p : Str} ;
@@ -187,7 +189,7 @@ oper
s2 = \\_,_,_ => [] ;
adv = \\_ => verb.p ; -- the particle of the verb
ext = [] ;
isNeg = False
vptyp = defaultVPTyp ;
} ;
old_VP = {
@@ -200,10 +202,11 @@ oper
h : Harmony
} ;
vp2old_vp : VP -> old_VP = \vp -> let verb = vp.s in {
s = \\vi,ant,b,agr0 =>
vp2old_vp : VP -> old_VP = \vp ->
let
verb = vp.s ;
sverb : VIForm => Anteriority => Polarity => Agr => {fin, inf : Str} = \\vi,ant,b,agr0 =>
let
agr = verbAgr agr0 ;
verbs = verb.s ;
part : Str = case vi of {
@@ -267,14 +270,21 @@ oper
VIPass Fut => mkvf (PassPresn passPol) ; --# notpresent
VIPass Pres => mkvf (PassPresn passPol) ;
VIInf i => mkvf (Inf i)
} ;
}
in {
s = case vp.vptyp.isPass of {
True => \\vif,ant,pol,agr => case vif of {
VIFin t => sverb ! VIPass t ! ant ! pol ! agr ;
_ => sverb ! vif ! ant ! pol ! agr
} ;
_ => sverb
} ;
s2 = vp.s2 ;
adv = vp.adv ; -- the particle of the verb
ext = vp.ext ;
sc = verb.sc ;
h = verb.h ;
isNeg = vp.isNeg
isNeg = vp.vptyp.isNeg
} ;
insertObj : (Bool => Polarity => Agr => Str) -> VP -> VP = \obj,vp -> {
@@ -284,7 +294,7 @@ oper
ext = vp.ext ;
sc = vp.sc ;
h = vp.h ;
isNeg = vp.isNeg
vptyp = vp.vptyp
} ;
insertObjPre : Bool -> (Bool -> Polarity -> Agr -> Str) -> VP -> VP = \isNeg, obj,vp -> {
@@ -292,9 +302,7 @@ oper
s2 = \\fin,b,a => obj fin b a ++ vp.s2 ! fin ! b ! a ;
adv = vp.adv ;
ext = vp.ext ;
sc = vp.sc ;
h = vp.h ;
isNeg = orB vp.isNeg isNeg
vptyp = {isNeg = orB vp.vptyp.isNeg isNeg ; isPass = vp.vptyp.isPass} ;
} ;
insertAdv : (Polarity => Str) -> VP -> VP = \adv,vp -> {
@@ -304,7 +312,15 @@ oper
adv = \\b => vp.adv ! b ++ adv ! b ;
sc = vp.sc ;
h = vp.h ;
isNeg = vp.isNeg --- missään
vptyp = vp.vptyp --- missään
} ;
passVP : VP -> NPForm -> VP = \vp,sc -> {
s = {s = vp.s.s ; h = vp.s.h ; p = vp.s.p ; sc = sc} ; -- minusta pidetään ---- TODO minun päälleni katsotaan
s2 = vp.s2 ;
ext = vp.ext ;
adv = vp.adv ;
vptyp = {isNeg = vp.vptyp.isNeg ; isPass = True} ;
} ;
insertExtrapos : Str -> VP -> VP = \obj,vp -> {
@@ -314,7 +330,7 @@ oper
adv = vp.adv ;
sc = vp.sc ;
h = vp.h ;
isNeg = vp.isNeg
vptyp = vp.vptyp
} ;
mkClausePol : Bool -> (Polarity -> Str) -> Agr -> VP -> Clause =