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

Merge pull request #334 from rnd0101/remove-seconda-part1

Browse Source 
Deprecate SecondA conjugation, fix many words
This commit is contained in:
Inari Listenmaa
2020-05-24 09:57:17 +02:00
committed by GitHub
parent a5d3edc06a a042a8c63c
commit b8bb2f5037
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/russian/LexiconRus.gf
View File

@@ -113,7 +113,7 @@ lin
floor_N = mkN "пол" ;
flow_V = regV imperfective firstE "тек" "у" "тёк" "теки" "течь" ;
flower_N = mkN "цветок";
fly_V = regV imperfective second "лета" "ю" "летал" "летай" "летать" ;
fly_V = regV imperfective first "лета" "ю" "летал" "летай" "летать" ;
fog_N = mkN "туман" ;
foot_N = mkN "ступня" ;
forest_N = mkN "лес" ; -- prepos -u
@@ -128,7 +128,7 @@ lin
girl_N = mkN "девочка" animate; -- vowel change
give_V3 = tvDirDir (regV imperfective firstE "да" "ю" "давал" "давай" "давать" ) ;
glove_N = mkN "перчатка" ; -- vowel change
go_V= regV imperfective second "хо" "жу" "ходил" "ходи" "ходить" ;
go_V = mkV imperfective "хожу" "ходишь" "ходит" "ходим" "ходите" "ходят" "ходил" "ходи" "ходить" ;
gold_N = mkN "золото" ;
good_A = mkA "хороший" "лучше" ;
grammar_N = mkN "грамматика";
@@ -139,7 +139,7 @@ lin
hand_N = mkN "рука" ;
harbour_N = mkN "порт" ; -- prepos -u
hat_N = mkN "шляпа" ;
hate_V2= dirV2 (regV imperfective second "ненави" "жу" "ненавидел" "ненавидь" "ненавидеть" );
hate_V2= dirV2 (mkV imperfective "ненавижу" "ненавидишь" "ненавидит" "ненавидим" "ненавидите" "ненавидят" "ненавидел" "ненавидь" "ненавидеть" );
head_N = mkN "голова" ;
hear_V2= dirV2 (regV imperfective first "слуша" "ю" "слушал" "слушай" "слушать" );
heart_N = mkN "сердце" "сердца" "сердцу" "сердца" "сердцем" "сердце" "сердце" "сердца" "сердец" "сердцам" "сердец" "сердцами" "сердцах" neuter inanimate ;
@@ -173,7 +173,7 @@ lin
leaf_N = mkN "лист" ; -- irregular pl
learn_V2= dirV2 (regV imperfective second "уч" "у" "учил" "учи" "учить" );
leather_N = mkN "кожа" ;
leave_V2= dirV2 (regV imperfective second "ухож" "у" "уходил" "уходи" "уходить" );
leave_V2= dirV2 (mkV imperfective "ухожу" "уходишь" "уходит" "уходим" "уходите" "уходят" "уходил" "уходи" "уходить" );
left_Ord = (uy_j_EndDecl "лев" ) ** {lock_A = <>};
leg_N = mkN "нога" ;
lie_V = regV imperfective firstE "лг" "у" "лгал" "лги" "лгать" ;
@@ -257,7 +257,7 @@ lin
science_N = mkN "наука" ;
scratch_V2 = dirV2 (regV imperfective first "чеш" "у" "чесал" "чеши" "чесать" ) ;
sea_N = mkN "море" ;
see_V2 = dirV2 (regV imperfective second "ви" "жу" "видел" "видь" "видеть" );
see_V2 = dirV2 (mkV imperfective "вижу" "видишь" "видит" "видим" "видите" "видят" "видел" "видь" "видеть");
seed_N = mkN "семя";
seek_V2 = dirV2 (regV imperfective first "ищ" "у" "искал" "ищи" "искать" );
sell_V3 = tvDirDir (regV imperfective firstE "прода" "ю" "продавал" "продавай" "продавать" );

17
src/russian/MorphoRus.gf
View File

@@ -1057,7 +1057,7 @@ oper ti_j_EndDecl : Str -> Adjective = \s ->{s = table {
---- (according to the number and the person of the subject)
---- patterns in the present tense in the indicative mood.
-- Foreign coincides with First. Deprecated
-- Foreign coincides with First. Deprecated. SecondA not needed, also deprecated.
param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ;
oper hasConj : Verbum -> Conjugation = \ v ->
@@ -1176,19 +1176,8 @@ oper presentConjMixed: Str -> Str -> PresentVerb = \del, sgP1End ->
PRF GPl P2 => del+ "тите" ;
PRF GPl P3 => del+ "тят"
};
-- +++ MG_UR: changed! (+ д) +++
oper presentConj2: Str -> Str -> PresentVerb = \del, sgP1End ->
table {
PRF (GSg _) P1 => del+ sgP1End ; -- sgP1End "жу"
PRF (GSg _) P2 => del+ "дишь" ;
PRF (GSg _) P3 => del+ "дит" ;
PRF GPl P1 => del+ "дим" ;
PRF GPl P2 => del+ "дите" ;
PRF GPl P3 => del+ "дят"
};
oper presentConj2a: Str -> Str -> PresentVerb = \del, sgP1End ->
oper presentConj2: Str -> Str -> PresentVerb = \del, sgP1End ->
table {
PRF (GSg _) P1 => del+ sgP1End ; -- sgP1End "жу"
PRF (GSg _) P2 => del+ "ишь" ;
@@ -1266,7 +1255,7 @@ oper verbDecl: Aspect -> Conjugation -> Str -> Str -> Str -> Str -> Str -> Verbu
First => <presentConj1,pastConj> ;
FirstE => <presentConj1E,pastConj> ;
Second => <presentConj2,pastConj> ;
SecondA => <presentConj2a,pastConj> ;
SecondA => <presentConj2,pastConj> ;
Mixed => <presentConjMixed,pastConj> ;
Dolzhen => <presentConjDolzhen,pastConjDolzhen> ;
Foreign => <presentConj1,pastConj> } in