GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-06-22 17:56:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Resolved conflict in a comment

Browse Source
This commit is contained in:
Roman Suzi
2020-05-24 09:59:08 +03:00
parent 8fbcd04421 a5d3edc06a
commit a042a8c63c
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/russian/MorphoRus.gf
View File

@@ -1057,8 +1057,8 @@ 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.
-- +++ MG_UR: new conjugation class 'Foreign' introduced +++
param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ; -- SecondA 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 ->
case v.s ! VFORM Act VINF of {
@@ -1147,7 +1147,7 @@ oper verbDolzhen : Verbum = verbDecl Imperfective Dolzhen "долж" "ен" "д
-- further conjugation class added by Magda Gerritsen and Ulrich Real:
-- 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};
@@ -1245,17 +1245,6 @@ oper pastConjDolzhen: Str -> PastVerb = \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.
-- It produces the full conjugation table for a verb entry
@@ -1269,7 +1258,7 @@ oper verbDecl: Aspect -> Conjugation -> Str -> Str -> Str -> Str -> Str -> Verbu
SecondA => <presentConj2,pastConj> ;
Mixed => <presentConjMixed,pastConj> ;
Dolzhen => <presentConjDolzhen,pastConjDolzhen> ;
Foreign => <presentConjForeign,pastConj> } in
Foreign => <presentConj1,pastConj> } in
let patt = case a of {
Perfective => mkVerbPerfective;
Imperfective => mkVerbImperfective } in