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

Russian: get rid of the Prepos2 case. Added an argument to Prepos instead to handle -y endings with the v and na prepositions. This saves us a few hundred lines of code. It's a bit pointless since the whole thing needs to be rewriten, but at least I'm getting familiar with the code.

Browse Source
This commit is contained in:
bjorn
2008-06-23 17:15:14 +00:00
parent 8cdad08ad9
commit a50c7e3a7c
4 changed files with 215 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

616
lib/resource-1.4/russian/MorphoRus.gf
View File

File diff suppressed because it is too large Load Diff

9
lib/resource-1.4/russian/ParadigmsRus.gf
View File

@@ -345,7 +345,6 @@ foreign = Foreign; -- +++ MG_UR: added +++
dative = Dat ; dative = Dat ;
genitive = Gen ; genitive = Gen ;
instructive = Inst ; instructive = Inst ;
prepositional = Prepos ;
singular = Sg ; singular = Sg ;
plural = Pl ; plural = Pl ;
animate = Animate ; animate = Animate ;
@@ -380,15 +379,15 @@ foreign = Foreign; -- +++ MG_UR: added +++
SF Sg Dat => datSg ; SF Sg Dat => datSg ;
SF Sg Acc => accSg ; SF Sg Acc => accSg ;
SF Sg Inst => instSg ; SF Sg Inst => instSg ;
SF Sg Prepos => preposSg ; SF Sg (Prepos PrepOther) => preposSg ;
SF Sg Prepos2 => prepos2Sg ; SF Sg (Prepos PrepVNa) => prepos2Sg ;
SF Pl Nom => nomPl ; SF Pl Nom => nomPl ;
SF Pl Gen => genPl ; SF Pl Gen => genPl ;
SF Pl Dat => datPl ; SF Pl Dat => datPl ;
SF Pl Acc => accPl ; SF Pl Acc => accPl ;
SF Pl Inst => instPl ; SF Pl Inst => instPl ;
SF Pl Prepos => preposPl ; SF Pl (Prepos PrepOther) => preposPl ;
SF Pl Prepos2 => prepos2Pl SF Pl (Prepos PrepVNa) => prepos2Pl
} ; } ;
g = g ; g = g ;
anim = anim anim = anim

6
lib/resource-1.4/russian/ResRus.gf
View File

@@ -19,7 +19,8 @@ flags coding=utf8 ; optimize=all ;
-- Some parameters, such as $Number$, are inherited from $ParamX$. -- Some parameters, such as $Number$, are inherited from $ParamX$.
param param
Gender = Masc | Fem | Neut ; Gender = Masc | Fem | Neut ;
Case = Nom | Gen | Dat | Acc | Inst | Prepos | Prepos2 ; -- +++ MG_UR: new case Prepos2 introduced! +++ Case = Nom | Gen | Dat | Acc | Inst | Prepos PrepKind ;
PrepKind = PrepOther | PrepVNa;
Animacy = Animate | Inanimate ; Animacy = Animate | Inanimate ;
Voice = Act | Pass ; Voice = Act | Pass ;
Aspect = Imperfective | Perfective ; Aspect = Imperfective | Perfective ;
@@ -292,8 +293,7 @@ oper sam: Refl=
Dat => "себе"; Dat => "себе";
Acc => "себя"; Acc => "себя";
Inst => "собой"; Inst => "собой";
Prepos => "себе"; Prepos _ => "себе"
Prepos2 => "себе" -- +++ MG_UR: added +++
} }
}; };

6
lib/resource-1.4/russian/StructuralRus.gf
View File

@@ -49,8 +49,7 @@ lin
i_Pron = pronYa ; i_Pron = pronYa ;
if_Subj = ss "если" ; if_Subj = ss "если" ;
in8front_Prep = { s = "перед" ; c = Inst}; in8front_Prep = { s = "перед" ; c = Inst};
--in_Prep = { s = "в" ; c = Prepos }; in_Prep = { s = "в" ; c = Prepos PrepVNa } ;
in_Prep = { s = "в" ; c = Prepos2 } ; -- +++ MG_UR: new case Prepos2 introduced! +++
it_Pron = pronOno ; it_Pron = pronOno ;
less_CAdv = ss "менее" ; less_CAdv = ss "менее" ;
many_Det = mnogoSgDet ** {n = Sg; g = (PGen Neut); c= Gen} ; many_Det = mnogoSgDet ** {n = Sg; g = (PGen Neut); c= Gen} ;
@@ -62,8 +61,7 @@ lin
much_Det = mnogoSgDet ** {n = Sg; g = (PGen Neut); c= Gen} ; -- same as previous much_Det = mnogoSgDet ** {n = Sg; g = (PGen Neut); c= Gen} ; -- same as previous
must_VV = verbDolzhen ; must_VV = verbDolzhen ;
no_Utt = ss ["Нет"] ; no_Utt = ss ["Нет"] ;
--on_Prep = { s = "на" ; c = Prepos }; on_Prep = { s = "на" ; c = Prepos PrepVNa };
on_Prep = { s = "на" ; c = Prepos2 }; -- +++ MG_UR: new case Prepos2 introduced! +++
--- DEPREC one_Quant = odinDet ** {lock_QuantSg = <>; n= Sg; g = PNoGen; c = Nom }; --- DEPREC one_Quant = odinDet ** {lock_QuantSg = <>; n= Sg; g = PNoGen; c = Nom };
--AStaruyj : --AStaruyj :
only_Predet = (uy_j_EndDecl "единственн" ) ** {lock_Predet = <>; n= Sg; g = PNoGen; c = Nom }; only_Predet = (uy_j_EndDecl "единственн" ) ** {lock_Predet = <>; n= Sg; g = PNoGen; c = Nom };