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

Removed special variant of Second conj, but left one in hasConj as it is used for a different purpose

Browse Source
This commit is contained in:
Roman Suzi
2020-05-23 18:24:03 +03:00
parent 189f27a07b
commit 69c1ff669c
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/russian/MorphoRus.gf
View File

@@ -1058,7 +1058,7 @@ oper ti_j_EndDecl : Str -> Adjective = \s ->{s = table {
---- 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 +++ -- +++ MG_UR: new conjugation class 'Foreign' introduced +++
param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ; param Conjugation = First | FirstE | Second | SecondA | Mixed | Dolzhen | Foreign ; -- SecondA deprecated
oper hasConj : Verbum -> Conjugation = \ v -> oper hasConj : Verbum -> Conjugation = \ v ->
case v.s ! VFORM Act VINF of { case v.s ! VFORM Act VINF of {
@@ -1177,18 +1177,7 @@ oper presentConjMixed: Str -> Str -> PresentVerb = \del, sgP1End ->
PRF GPl P3 => del+ "тят" PRF GPl P3 => del+ "тят"
}; };
-- +++ MG_UR: changed! (+ д) +++
oper presentConj2: Str -> Str -> PresentVerb = \del, sgP1End -> 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 ->
table { table {
PRF (GSg _) P1 => del+ sgP1End ; -- sgP1End "жу" PRF (GSg _) P1 => del+ sgP1End ; -- sgP1End "жу"
PRF (GSg _) P2 => del+ "ишь" ; PRF (GSg _) P2 => del+ "ишь" ;
@@ -1277,7 +1266,7 @@ oper verbDecl: Aspect -> Conjugation -> Str -> Str -> Str -> Str -> Str -> Verbu
First => <presentConj1,pastConj> ; First => <presentConj1,pastConj> ;
FirstE => <presentConj1E,pastConj> ; FirstE => <presentConj1E,pastConj> ;
Second => <presentConj2,pastConj> ; Second => <presentConj2,pastConj> ;
SecondA => <presentConj2a,pastConj> ; SecondA => <presentConj2,pastConj> ;
Mixed => <presentConjMixed,pastConj> ; Mixed => <presentConjMixed,pastConj> ;
Dolzhen => <presentConjDolzhen,pastConjDolzhen> ; Dolzhen => <presentConjDolzhen,pastConjDolzhen> ;
Foreign => <presentConjForeign,pastConj> } in Foreign => <presentConjForeign,pastConj> } in