GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-30 10:28:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

change a suspiciouslooking hardcoded 'olla' into verbOlema.s ! Inf i in predV; remove some redundant code in insertXxx opers.

Browse Source
This commit is contained in:
Inari Listenmaa
2017-08-28 17:18:14 +02:00
parent c0f3f43350
commit 8342634d75
1 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/estonian/ResEst.gf
View File

@@ -209,7 +209,8 @@ oper
<VIPass Fut, _> => <"ei", verbs ! PassPresn False, "ole"> ; --# notpresent <VIPass Fut, _> => <"ei", verbs ! PassPresn False, "ole"> ; --# notpresent
<VIPass Cond, _> => <"ei", verbs ! ConditPass, "oleks"> ; --# notpresent <VIPass Cond, _> => <"ei", verbs ! ConditPass, "oleks"> ; --# notpresent
<VIPass Past, _> => <"ei", verbs ! PassImpf False, "olnud"> ; --# notpresent <VIPass Past, _> => <"ei", verbs ! PassImpf False, "olnud"> ; --# notpresent
<VIInf i, _> => <"ei", verbs ! Inf i, "olla"> <VIInf i, _> => <"ei", verbs ! Inf i, verbOlema.s ! Inf i>
} ; } ;
ei : Str = einegole.p1 ; ei : Str = einegole.p1 ;
@@ -249,41 +250,17 @@ oper
sc = verb.sc sc = verb.sc
} ; } ;
insertObj : (Bool => Polarity => Agr => Str) -> VP -> VP = \obj,vp -> { insertObj : (Bool => Polarity => Agr => Str) -> VP -> VP = \obj,vp ->
s = vp.s ; vp ** { s2 = \\fin,b,a => vp.s2 ! fin ! b ! a ++ obj ! fin ! b ! a } ;
s2 = \\fin,b,a => vp.s2 ! fin ! b ! a ++ obj ! fin ! b ! a ;
adv = vp.adv ;
p = vp.p ;
ext = vp.ext ;
sc = vp.sc ;
} ;
insertObjPre : (Bool => Polarity => Agr => Str) -> VP -> VP = \obj,vp -> { insertObjPre : (Bool => Polarity => Agr => Str) -> VP -> VP = \obj,vp ->
s = vp.s ; vp ** { s2 = \\fin,b,a => obj ! fin ! b ! a ++ vp.s2 ! fin ! b ! a } ;
s2 = \\fin,b,a => obj ! fin ! b ! a ++ vp.s2 ! fin ! b ! a ;
adv = vp.adv ;
p = vp.p ;
ext = vp.ext ;
sc = vp.sc ;
} ;
insertAdv : Str -> VP -> VP = \adv,vp -> { insertAdv : Str -> VP -> VP = \adv,vp ->
s = vp.s ; vp ** { adv = vp.adv ++ adv } ;
s2 = vp.s2 ;
p = vp.p ;
ext = vp.ext ;
adv = vp.adv ++ adv ;
sc = vp.sc ;
} ;
insertExtrapos : Str -> VP -> VP = \obj,vp -> { insertExtrapos : Str -> VP -> VP = \obj,vp ->
s = vp.s ; vp ** { ext = vp.ext ++ obj } ;
s2 = vp.s2 ;
p = vp.p ;
ext = vp.ext ++ obj ;
adv = vp.adv ;
sc = vp.sc ;
} ;
-- For $Sentence$. -- For $Sentence$.
@@ -389,9 +366,6 @@ oper
--waiting for post construction in GF :P --waiting for post construction in GF :P
gi : Str = "gi" ; gi : Str = "gi" ;
glueTok : Str -> Str = \s -> "&+" ++ s ;
-- This is used for subjects of passives: therefore isFin in False. -- This is used for subjects of passives: therefore isFin in False.
subjForm : NP -> NPForm -> Polarity -> Str = \np,sc,b -> subjForm : NP -> NPForm -> Polarity -> Str = \np,sc,b ->