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

Fixed notpresent

Browse Source
This commit is contained in:
Roman Suzi
2020-09-06 16:32:28 +03:00
parent db8f3ebf72
commit 6ff11a2458
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/russian/DictRus.gf
View File

@@ -4138,19 +4138,19 @@ lin
skoree_Adv = mkAdv skoryj_A.comp ; skoree_Adv = mkAdv skoryj_A.comp ;
skoraja_N = mkN skoryj_A feminine inanimate ; skoraja_N = mkN skoryj_A feminine inanimate ;
uvidennyi_A = mkA (uvidetq_V ** {pppss="увиден"}) Pass Past ; uvidennyi_A = mkA (uvidetq_V ** {pppss="увиден"}) Pass Past ; --# notpresent
uvidevshyi_A = mkA (uvidetq_V ** {pppss="увиден"}) Act Past ; uvidevshyi_A = mkA (uvidetq_V ** {pppss="увиден"}) Act Past ; --# notpresent
vedshij_A = mkA vesti_V Act Past ; vedshij_A = mkA vesti_V Act Past ;--# notpresent
vedomyj_A = mkA vesti_V Pass Pres ; vedomyj_A = mkA vesti_V Pass Pres ;
vedyonnyj_A = mkA vesti_V Pass Past ; vedyonnyj_A = mkA vesti_V Pass Past ;--# notpresent
pevshij_A = mkA petq_V Act Past ; pevshij_A = mkA petq_V Act Past ;--# notpresent
pojuszij_A = mkA petq_V Act Pres ; pojuszij_A = mkA petq_V Act Pres ;
petyj_A = mkA petq_V Pass Past ; petyj_A = mkA petq_V Pass Past ; --# notpresent
napravivshij_A = mkA napravitq_V Act Past ; napravivshij_A = mkA napravitq_V Act Past ; --# notpresent
napravlennyj_A = mkA napravitq_V Pass Past ; napravlennyj_A = mkA napravitq_V Pass Past ; --# notpresent
okazavshijsja_A = mkA okazatqsja_V Act Past ; okazavshijsja_A = mkA okazatqsja_V Act Past ; --# notpresent
} }

27
src/russian/ParadigmsRus.gf
View File

@@ -306,29 +306,28 @@ oper
= \v,voice,t -> = \v,voice,t ->
let refl = case v.refl of {Reflexive => "ся" ; _ => ""} in let refl = case v.refl of {Reflexive => "ся" ; _ => ""} in
case <voice,t> of { case <voice,t> of {
<Pass,Past|Cond> => lin A ( -- TODO: very rough. Cover more cases <Pass,Past|Cond> => lin A ( --# notpresent TODO: very rough. Cover more cases
guessAdjectiveForms (v.pppss + "ный") ** { guessAdjectiveForms (v.pppss + "ный") ** { --# notpresent
sm=v.pppss ; sm=v.pppss ; --# notpresent
sf=v.pppss + "а"; sf=v.pppss + "а"; --# notpresent
sn=v.pppss + "о"; sn=v.pppss + "о"; --# notpresent
sp=v.pppss + "ы" sp=v.pppss + "ы" --# notpresent
} } --# notpresent
) ; ) ;--# notpresent
<Pass,Pres> => lin A ( -- overgenerated <Pass,Pres> => lin A ( -- overgenerated
let s : Str = case v.prpl1 of { let s : Str = case v.prpl1 of {
f + #consonant + "ём" => (Predef.tk 2 v.prpl1) + "омый" ; f + #consonant + "ём" => (Predef.tk 2 v.prpl1) + "омый" ;
_ => v.prpl1 + "ый" _ => v.prpl1 + "ый"
} in } in
makeAdjectiveFormsUseIndex s "" (Z.ZA 1 Z.No Z.A_ Z.NoC) PreferFull) ; makeAdjectiveFormsUseIndex s "" (Z.ZA 1 Z.No Z.A_ Z.NoC) PreferFull) ;
<Act,Past|Cond> => lin A ( --# notpresent
let s : Str = case v.inf of { --# notpresent
_ + ("сти"|"зти") => (Predef.tk 1 v.prsg1) + "ший" ; --# notpresent TODO: check if not all of these cases are ok
_ => (Predef.tk 1 v.psgm) + "вший" --# notpresent
} in Z.onlyParticipleForms (makeAdjectiveFormsUseIndex (s + refl) "" (Z.ZA 4 Z.No Z.A_ Z.NoC) PreferFull)) ; --# notpresent
<Act,Pres> => lin A ( <Act,Pres> => lin A (
Z.onlyParticipleForms ( Z.onlyParticipleForms (
makeAdjectiveFormsUseIndex (((Predef.tk 1 v.prpl3) + "щий") + refl) "" (Z.ZA 4 Z.No Z.A_ Z.NoC) PreferFull)) ; makeAdjectiveFormsUseIndex (((Predef.tk 1 v.prpl3) + "щий") + refl) "" (Z.ZA 4 Z.No Z.A_ Z.NoC) PreferFull)) ;
<Act,Past|Cond> => lin A (
let s : Str = case v.inf of {
_ + ("сти"|"зти") => (Predef.tk 1 v.prsg1) + "ший" ; -- TODO: check if not all of these cases are ok
_ => (Predef.tk 1 v.psgm) + "вший"
} in
Z.onlyParticipleForms (makeAdjectiveFormsUseIndex (s + refl) "" (Z.ZA 4 Z.No Z.A_ Z.NoC) PreferFull)) ;
_ => Predef.error "Error: participle for this voice and tense does not exist" _ => Predef.error "Error: participle for this voice and tense does not exist"
} -- TODO: suppress comp and short for all but Pass Pres } -- TODO: suppress comp and short for all but Pass Pres
} ; } ;