forked from GitHub/gf-rgl
Another batch of small Russian Phrasebook fixes
This commit is contained in:
@@ -11,7 +11,7 @@ lin
|
|||||||
animal_N = mkN "животное" animate;
|
animal_N = mkN "животное" animate;
|
||||||
answer_V2S = dirV2 (regV imperfective first "отвеча" "ю" "отвечал" "отвечай" "отвечать" );
|
answer_V2S = dirV2 (regV imperfective first "отвеча" "ю" "отвечал" "отвечай" "отвечать" );
|
||||||
apartment_N = mkN "квартира" ;
|
apartment_N = mkN "квартира" ;
|
||||||
apple_N = mkN "яблоко" ;
|
apple_N = mkN "яблоко" inanimate ;
|
||||||
art_N = mkN "искусство" ;
|
art_N = mkN "искусство" ;
|
||||||
ashes_N = mkN "пепел" ;
|
ashes_N = mkN "пепел" ;
|
||||||
ask_V2Q = dirV2 (regV imperfective first "спрашива" "ю" "спрашивал" "спрашивай" "спрашивать") ;
|
ask_V2Q = dirV2 (regV imperfective first "спрашива" "ю" "спрашивал" "спрашивай" "спрашивать") ;
|
||||||
@@ -22,7 +22,7 @@ lin
|
|||||||
bark_N = mkN "кора";
|
bark_N = mkN "кора";
|
||||||
beautiful_A = mkA "красивый";
|
beautiful_A = mkA "красивый";
|
||||||
become_VA = regV perfective second "станов" "лю" "стал" "стань" "стать" ;
|
become_VA = regV perfective second "станов" "лю" "стал" "стань" "стать" ;
|
||||||
beer_N = mkN "пиво" ;
|
beer_N = mkIndeclinableNoun "пиво" neuter inanimate ;
|
||||||
beg_V2V = dirV2 (mkV imperfective "прошу" "просишь" "просит" "просим" "просите" "просят" "просил" "проси" "просить" );
|
beg_V2V = dirV2 (mkV imperfective "прошу" "просишь" "просит" "просим" "просите" "просят" "просил" "проси" "просить" );
|
||||||
belly_N = mkN "живот" ;
|
belly_N = mkN "живот" ;
|
||||||
big_A = mkA "большой" "больше" ;
|
big_A = mkA "большой" "больше" ;
|
||||||
|
|||||||
@@ -8,13 +8,8 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
|
|||||||
DetCN kazhduj okhotnik = {
|
DetCN kazhduj okhotnik = {
|
||||||
s = \\c => case kazhduj.size of {
|
s = \\c => case kazhduj.size of {
|
||||||
nom =>
|
nom =>
|
||||||
case kazhduj.c of {
|
|
||||||
Nom =>
|
|
||||||
kazhduj.s ! AF (extCase c) okhotnik.anim (gennum okhotnik.g kazhduj.n) ++
|
kazhduj.s ! AF (extCase c) okhotnik.anim (gennum okhotnik.g kazhduj.n) ++
|
||||||
okhotnik.s ! NF kazhduj.n (extCase c) nom ;
|
okhotnik.s ! NF kazhduj.n (extCase c) nom ;
|
||||||
_ =>
|
|
||||||
kazhduj.s ! AF (extCase c) okhotnik.anim (gennum okhotnik.g kazhduj.n) ++
|
|
||||||
okhotnik.s ! NF kazhduj.n kazhduj.c nom } ;
|
|
||||||
sgg =>
|
sgg =>
|
||||||
case kazhduj.c of {
|
case kazhduj.c of {
|
||||||
Nom =>
|
Nom =>
|
||||||
@@ -155,7 +150,7 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
|
|||||||
PossPron p = {s = \\af => p.s ! mkPronForm (caseAF af) No (Poss (gennum (genAF af) (numAF af) )); c=Nom; g = PNoGen; size = nom} ;
|
PossPron p = {s = \\af => p.s ! mkPronForm (caseAF af) No (Poss (gennum (genAF af) (numAF af) )); c=Nom; g = PNoGen; size = nom} ;
|
||||||
|
|
||||||
NumCard c = c ;
|
NumCard c = c ;
|
||||||
NumSg = {s = \\_,_,_ => [] ; n = Sg ; size = sgg} ;
|
NumSg = {s = \\_,_,_ => [] ; n = Sg ; size = nom} ;
|
||||||
NumPl = {s = \\_,_,_ => [] ; n = Pl ; size = plg} ;
|
NumPl = {s = \\_,_,_ => [] ; n = Pl ; size = plg} ;
|
||||||
|
|
||||||
OrdNumeral numeral = variants {} ; ---- TODO; needed to compile Constructors
|
OrdNumeral numeral = variants {} ; ---- TODO; needed to compile Constructors
|
||||||
|
|||||||
Reference in New Issue
Block a user