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 #332 from rnd0101/fix-must-dolzhen

Browse Source 
Fix must (dolzhen) in Rus RG
This commit is contained in:
Inari Listenmaa
2020-05-21 18:24:37 +02:00
committed by GitHub
parent 1d621f5a7f 1cde3460b8
commit 45badcbe75
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/russian/MorphoRus.gf
View File

@@ -1141,7 +1141,7 @@ oper verbKhotet : Verbum = verbDecl Imperfective Mixed "хо" "у" "хотел"
--AR oper verbKhotet : Verbum = verbDecl Imperfective Mixed "хоч" "у" "хотел" "хоти" "хотеть"; --AR oper verbKhotet : Verbum = verbDecl Imperfective Mixed "хоч" "у" "хотел" "хоти" "хотеть";
-- Irregular -- Irregular
oper verbDolzhen : Verbum = verbDecl Imperfective Dolzhen "долж" "ен" "долж" ["будь должен"] ["быть должным"] ; 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:
@@ -1159,10 +1159,10 @@ oper PresentVerb : Type = PresentVF => Str ;
oper presentConjDolzhen: Str -> Str -> PresentVerb = \del, sgP1End -> oper presentConjDolzhen: Str -> Str -> PresentVerb = \del, sgP1End ->
table { table {
PRF GPl _ => del + "ны" ;
PRF (GSg Masc) _ => del + sgP1End ; PRF (GSg Masc) _ => del + sgP1End ;
PRF (GSg Fem) _ => del + "на" ; PRF (GSg Fem) _ => del + "на" ;
PRF (GSg Neut) _ => del + "но" PRF (GSg Neut) _ => del + "но" ;
PRF GPl _ => del + "ны"
}; };
-- +++ MG_UR: changed! +++ -- +++ MG_UR: changed! +++
@@ -1250,10 +1250,10 @@ oper pastConj: Str -> PastVerb = \del ->
oper pastConjDolzhen: Str -> PastVerb = \del -> oper pastConjDolzhen: Str -> PastVerb = \del ->
table { table {
PSF (GSg Masc) => ["был "] + del + "ен" ; PSF (GSg Masc) => "был" ++ del + "ен" ;
PSF (GSg Fem) => ["была "] + del + "на" ; PSF (GSg Fem) => "была" ++ del + "на" ;
PSF (GSg Neut) => ["было "] + del + "но" ; PSF (GSg Neut) => "было" ++ del + "но" ;
PSF GPl => ["были "] + del + "ны" PSF GPl => "были" ++ del + "ны"
}; };
-- further class added by Magda Gerritsen and Ulrich Real -- further class added by Magda Gerritsen and Ulrich Real
@@ -1321,7 +1321,7 @@ oper mkVerbImperfective : Str -> Str -> PresentVerb -> PastVerb -> Verbum =
VSUB gn => add_sya vox (past ! (PSF gn)) ++ "бы"; VSUB gn => add_sya vox (past ! (PSF gn)) ++ "бы";
VIND (GSg _) (VPresent p) => add_sya vox (presentFuture ! (PRF (GSg Masc) p)); VIND (GSg g) (VPresent p) => add_sya vox (presentFuture ! (PRF (GSg g) p));
VIND GPl (VPresent p) => add_sya vox (presentFuture ! (PRF GPl p)); VIND GPl (VPresent p) => add_sya vox (presentFuture ! (PRF GPl p));
VIND (GSg _) (VFuture P1) => "буду" ++ add_sya vox inf ; VIND (GSg _) (VFuture P1) => "буду" ++ add_sya vox inf ;
VIND (GSg _) (VFuture P2) => "будешь" ++ add_sya vox inf ; VIND (GSg _) (VFuture P2) => "будешь" ++ add_sya vox inf ;
@@ -1347,7 +1347,7 @@ oper mkVerbPerfective: Str -> Str -> PresentVerb -> PastVerb -> Verbum =
VSUB gn => add_sya vox (past ! (PSF gn)) ++ "бы" ; VSUB gn => add_sya vox (past ! (PSF gn)) ++ "бы" ;
VIND (GSg _) (VPresent p) => (presentFuture ! (PRF (GSg Masc) p)); -- these are not correct, VIND (GSg g) (VPresent p) => (presentFuture ! (PRF (GSg g) p)); -- these are not correct,
VIND GPl (VPresent p) => (presentFuture ! (PRF GPl p)) ; -- but used elsewhere VIND GPl (VPresent p) => (presentFuture ! (PRF GPl p)) ; -- but used elsewhere
VIND gn (VFuture p) => add_sya vox (presentFuture ! (PRF gn p)) ; VIND gn (VFuture p) => add_sya vox (presentFuture ! (PRF gn p)) ;
VIND gn VPast => add_sya vox (past ! (PSF gn)) VIND gn VPast => add_sya vox (past ! (PSF gn))