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

Merge pull request #335 from rnd0101/there-is-no-foreign-conj-in-russian

Browse Source 
Conjugation class Foreign is not needed, coincides with First
This commit is contained in:
Inari Listenmaa
2020-05-24 07:46:57 +02:00
committed by GitHub
parent 189f27a07b 8290ace214
commit a5d3edc06a
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/russian/LexiconRus.gf
View File

@@ -208,7 +208,7 @@ lin
oil_N = mkN "нефть" ; oil_N = mkN "нефть" ;
old_A = mkA "старый" "старше" ; old_A = mkA "старый" "старше" ;
open_V2= dirV2 (regV imperfective first "открыва" "ю" "открывал" "открывай" "открывать" ); open_V2= dirV2 (regV imperfective first "открыва" "ю" "открывал" "открывай" "открывать" );
--- organise_V2 = dirV2 (regV imperfective foreign "организу" "ю" "организовал" "организуй" "организовать" ); -- +++ MG_UR: added +++ --- organise_V2 = dirV2 (regV imperfective first "организу" "ю" "организовал" "организуй" "организовать" );
paint_V2A = dirV2 (regV imperfective first "рису" "ю" "рисовал" "рисуй" "рисовать" ) ; paint_V2A = dirV2 (regV imperfective first "рису" "ю" "рисовал" "рисуй" "рисовать" ) ;
--- palace_N = nDvorec "двор" ; -- +++ MG_UR: added +++ --- palace_N = nDvorec "двор" ; -- +++ MG_UR: added +++
paper_N = mkN "бумага" ; paper_N = mkN "бумага" ;

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) ---- (according to the number and the person of the subject)
---- patterns in the present tense in the indicative mood. ---- patterns in the present tense in the indicative mood.
-- +++ MG_UR: new conjugation class 'Foreign' introduced +++ -- Foreign coincides with First. Deprecated
param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ; param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ;
oper hasConj : Verbum -> Conjugation = \ v -> oper hasConj : Verbum -> Conjugation = \ v ->
@@ -1147,7 +1147,7 @@ oper verbDolzhen : Verbum = verbDecl Imperfective Dolzhen "долж" "ен" "д
-- further conjugation class added by Magda Gerritsen and Ulrich Real: -- further conjugation class added by Magda Gerritsen and Ulrich Real:
-- foreign words introduced in Russian -- foreign words introduced in Russian
oper verbOrganisuet : Verbum = verbDecl Imperfective Foreign "организу" "ю" "организовал" "организуй" "организовать"; oper verbOrganisuet : Verbum = verbDecl Imperfective First "организу" "ю" "организовал" "организуй" "организовать";
oper idetDozhd: Verbum -> Verbum = \idet -> {s = \\vf=>idet.s!vf ++ "дождь"; asp = Imperfective}; oper idetDozhd: Verbum -> Verbum = \idet -> {s = \\vf=>idet.s!vf ++ "дождь"; asp = Imperfective};
@@ -1256,17 +1256,6 @@ oper pastConjDolzhen: Str -> PastVerb = \del ->
PSF GPl => "были" ++ del + "ны" PSF GPl => "были" ++ del + "ны"
}; };
-- further class added by Magda Gerritsen and Ulrich Real
oper presentConjForeign: 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+ "ют"
};
-- "verbDecl" sorts out verbs according to the aspect and voice parameters. -- "verbDecl" sorts out verbs according to the aspect and voice parameters.
-- It produces the full conjugation table for a verb entry -- It produces the full conjugation table for a verb entry
@@ -1280,7 +1269,7 @@ oper verbDecl: Aspect -> Conjugation -> Str -> Str -> Str -> Str -> Str -> Verbu
SecondA => <presentConj2a,pastConj> ; SecondA => <presentConj2a,pastConj> ;
Mixed => <presentConjMixed,pastConj> ; Mixed => <presentConjMixed,pastConj> ;
Dolzhen => <presentConjDolzhen,pastConjDolzhen> ; Dolzhen => <presentConjDolzhen,pastConjDolzhen> ;
Foreign => <presentConjForeign,pastConj> } in Foreign => <presentConj1,pastConj> } in
let patt = case a of { let patt = case a of {
Perfective => mkVerbPerfective; Perfective => mkVerbPerfective;
Imperfective => mkVerbImperfective } in Imperfective => mkVerbImperfective } in

4
src/russian/ParadigmsRus.gf
View File

@@ -184,7 +184,7 @@ firstE: Conjugation; -- Verbs with vowel "ё": "даёшь" (give), "пьёшь
second: Conjugation; -- "вид-Ишь, вид-Им" second: Conjugation; -- "вид-Ишь, вид-Им"
mixed: Conjugation; -- "хоч-Ешь - хот-Им" mixed: Conjugation; -- "хоч-Ешь - хот-Им"
dolzhen: Conjugation; -- irregular dolzhen: Conjugation; -- irregular
foreign: Conjugation; -- foreign words which are used in Russian, +++ MG_UR: added +++ foreign: Conjugation; -- deprecated, not needed
true: Bool; true: Bool;
@@ -252,7 +252,7 @@ second = Second ;
secondA = SecondA ; secondA = SecondA ;
mixed = Mixed ; mixed = Mixed ;
dolzhen = Dolzhen; dolzhen = Dolzhen;
foreign = Foreign; -- +++ MG_UR: added +++ foreign = Foreign; -- deprecated. Not needed
true = True; true = True;
false = False ; false = False ;