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

Merge pull request #329 from rnd0101/fix-rus-can

Browse Source 
Fix can (moch) in Russian RG
This commit is contained in:
Inari Listenmaa
2020-05-15 09:58:00 +02:00
committed by GitHub
parent 3633e3f6f5 c5b4f3e222
commit 46772bc771
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/russian/LexiconRus.gf
View File

@@ -21,7 +21,7 @@ lin
bank_N = mkN "банк" ; bank_N = mkN "банк" ;
bark_N = mkN "кора"; bark_N = mkN "кора";
beautiful_A = mkA "красивый"; beautiful_A = mkA "красивый";
become_VA = regV perfective second "станов" "лю" "стал" "стань" "стать" ; become_VA = regV perfective secondA "станов" "лю" "стал" "стань" "стать" ;
beer_N = mkIndeclinableNoun "пиво" neuter inanimate ; beer_N = mkIndeclinableNoun "пиво" neuter inanimate ;
beg_V2V = dirV2 (mkV imperfective "прошу" "просишь" "просит" "просим" "просите" "просят" "просил" "проси" "просить" ); beg_V2V = dirV2 (mkV imperfective "прошу" "просишь" "просит" "просим" "просите" "просят" "просил" "проси" "просить" );
belly_N = mkN "живот" ; belly_N = mkN "живот" ;

10
src/russian/MorphoRus.gf
View File

@@ -1228,6 +1228,14 @@ oper presentConj1Moch: Str -> Str -> Str -> PresentVerb = \del, sgP1End, altRoot
PRF GPl P3 => del+ sgP1End + "т" PRF GPl P3 => del+ sgP1End + "т"
}; };
oper pastConjMoch: Str -> PastVerb = \del ->
table {
PSF (GSg Masc) => del ;
PSF (GSg Fem) => del +"ла" ;
PSF (GSg Neut) => del+"ло" ;
PSF GPl => del+ "ли"
};
-- "PastVerb" takes care of the past tense conjugation. -- "PastVerb" takes care of the past tense conjugation.
param PastVF = PSF GenNum ; param PastVF = PSF GenNum ;
@@ -1285,7 +1293,7 @@ oper verbDeclMoch: Aspect -> Conjugation -> Str -> Str -> Str -> Str ->Str -> St
let patt = case a of { let patt = case a of {
Perfective => mkVerbPerfective; Perfective => mkVerbPerfective;
Imperfective => mkVerbImperfective } in Imperfective => mkVerbImperfective } in
patt inf imperSgP2 (presentConj1Moch del sgP1End altRoot) (pastConj sgMascPast); patt inf imperSgP2 (presentConj1Moch del sgP1End altRoot) (pastConjMoch sgMascPast);
oper add_sya : Voice -> Str -> Str = \v,x -> oper add_sya : Voice -> Str -> Str = \v,x ->
case v of { case v of {