forked from GitHub/gf-core
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.
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -345,7 +345,6 @@ foreign = Foreign; -- +++ MG_UR: added +++
|
||||
dative = Dat ;
|
||||
genitive = Gen ;
|
||||
instructive = Inst ;
|
||||
prepositional = Prepos ;
|
||||
singular = Sg ;
|
||||
plural = Pl ;
|
||||
animate = Animate ;
|
||||
@@ -380,15 +379,15 @@ foreign = Foreign; -- +++ MG_UR: added +++
|
||||
SF Sg Dat => datSg ;
|
||||
SF Sg Acc => accSg ;
|
||||
SF Sg Inst => instSg ;
|
||||
SF Sg Prepos => preposSg ;
|
||||
SF Sg Prepos2 => prepos2Sg ;
|
||||
SF Sg (Prepos PrepOther) => preposSg ;
|
||||
SF Sg (Prepos PrepVNa) => prepos2Sg ;
|
||||
SF Pl Nom => nomPl ;
|
||||
SF Pl Gen => genPl ;
|
||||
SF Pl Dat => datPl ;
|
||||
SF Pl Acc => accPl ;
|
||||
SF Pl Inst => instPl ;
|
||||
SF Pl Prepos => preposPl ;
|
||||
SF Pl Prepos2 => prepos2Pl
|
||||
SF Pl (Prepos PrepOther) => preposPl ;
|
||||
SF Pl (Prepos PrepVNa) => prepos2Pl
|
||||
} ;
|
||||
g = g ;
|
||||
anim = anim
|
||||
|
||||
@@ -19,7 +19,8 @@ flags coding=utf8 ; optimize=all ;
|
||||
-- Some parameters, such as $Number$, are inherited from $ParamX$.
|
||||
param
|
||||
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 ;
|
||||
Voice = Act | Pass ;
|
||||
Aspect = Imperfective | Perfective ;
|
||||
@@ -292,8 +293,7 @@ oper sam: Refl=
|
||||
Dat => "себе";
|
||||
Acc => "себя";
|
||||
Inst => "собой";
|
||||
Prepos => "себе";
|
||||
Prepos2 => "себе" -- +++ MG_UR: added +++
|
||||
Prepos _ => "себе"
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -49,8 +49,7 @@ lin
|
||||
i_Pron = pronYa ;
|
||||
if_Subj = ss "если" ;
|
||||
in8front_Prep = { s = "перед" ; c = Inst};
|
||||
--in_Prep = { s = "в" ; c = Prepos };
|
||||
in_Prep = { s = "в" ; c = Prepos2 } ; -- +++ MG_UR: new case Prepos2 introduced! +++
|
||||
in_Prep = { s = "в" ; c = Prepos PrepVNa } ;
|
||||
it_Pron = pronOno ;
|
||||
less_CAdv = ss "менее" ;
|
||||
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
|
||||
must_VV = verbDolzhen ;
|
||||
no_Utt = ss ["Нет"] ;
|
||||
--on_Prep = { s = "на" ; c = Prepos };
|
||||
on_Prep = { s = "на" ; c = Prepos2 }; -- +++ MG_UR: new case Prepos2 introduced! +++
|
||||
on_Prep = { s = "на" ; c = Prepos PrepVNa };
|
||||
--- DEPREC one_Quant = odinDet ** {lock_QuantSg = <>; n= Sg; g = PNoGen; c = Nom };
|
||||
--AStaruyj :
|
||||
only_Predet = (uy_j_EndDecl "единственн" ) ** {lock_Predet = <>; n= Sg; g = PNoGen; c = Nom };
|
||||
|
||||
Reference in New Issue
Block a user