mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-27 17:08:54 -06:00
(Rus) Fix syntax in ParadigmsRus to show in synopsis; whitespace removal
This commit is contained in:
@@ -37,13 +37,13 @@ flags coding=utf8 ;
|
|||||||
-- To abstract over gender names, we define the following identifiers.
|
-- To abstract over gender names, we define the following identifiers.
|
||||||
|
|
||||||
oper
|
oper
|
||||||
Gender : Type ;
|
Gender : Type ; -- Parameter for mkN*
|
||||||
masculine : Gender ;
|
masculine : Gender ;
|
||||||
feminine : Gender ;
|
feminine : Gender ;
|
||||||
neuter : Gender ;
|
neuter : Gender ;
|
||||||
|
|
||||||
-- To abstract over case names, we define the following.
|
-- To abstract over case names, we define the following.
|
||||||
Case : Type ;
|
Case : Type ; -- Parameter for mkPrep, mkA2, mkV2, mkV3
|
||||||
|
|
||||||
nominative : Case ;
|
nominative : Case ;
|
||||||
genitive : Case ;
|
genitive : Case ;
|
||||||
@@ -57,14 +57,14 @@ oper
|
|||||||
-- standard for Russian textbooks.
|
-- standard for Russian textbooks.
|
||||||
|
|
||||||
-- To abstract over number names, we define the following.
|
-- To abstract over number names, we define the following.
|
||||||
Number : Type ;
|
Number : Type ; -- Parameter for mkPN
|
||||||
|
|
||||||
singular : Number ;
|
singular : Number ;
|
||||||
plural : Number ;
|
plural : Number ;
|
||||||
|
|
||||||
--2 Nouns
|
--2 Nouns
|
||||||
|
|
||||||
Animacy: Type ;
|
Animacy : Type ; -- Parameter for mkN, mkPN
|
||||||
|
|
||||||
animate : Animacy;
|
animate : Animacy;
|
||||||
inanimate : Animacy;
|
inanimate : Animacy;
|
||||||
@@ -87,7 +87,7 @@ oper
|
|||||||
-- and the prepositional form after в and на, and
|
-- and the prepositional form after в and на, and
|
||||||
-- the corresponding six plural forms and the gender and animacy.
|
-- the corresponding six plural forms and the gender and animacy.
|
||||||
|
|
||||||
mkN : (nomSg, genSg, datSg, accSg, instSg, preposSg, prepos2Sg, nomPl, genPl, datPl, accPl, instPl, preposPl : Str) -> Gender -> Animacy -> N
|
mkN : (nomSg, genSg, datSg, accSg, instSg, preposSg, prepos2Sg, nomPl, genPl, datPl, accPl, instPl, preposPl : Str) -> Gender -> Animacy -> N -- Worst case - give six singular forms: Nominative, Genetive, Dative, Accusative, Instructive and Prepositional; and the prepositional form after в and на, and the corresponding six plural forms and the gender and animacy.
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
mkN2 : overload {
|
mkN2 : overload {
|
||||||
@@ -174,11 +174,15 @@ oper
|
|||||||
-- rather than verbs. Aspect is regarded as an inherent parameter of a verb.
|
-- rather than verbs. Aspect is regarded as an inherent parameter of a verb.
|
||||||
-- Notice, that some forms are never used for some verbs.
|
-- Notice, that some forms are never used for some verbs.
|
||||||
|
|
||||||
Voice: Type;
|
Voice : Type ; -- Parameter to mkV*
|
||||||
Aspect: Type;
|
active : Voice ;
|
||||||
Bool: Type;
|
passive : Voice ;
|
||||||
Conjugation: Type ;
|
|
||||||
|
|
||||||
|
Aspect : Type ; -- Parameter to mkV*
|
||||||
|
imperfective : Aspect ;
|
||||||
|
perfective : Aspect ;
|
||||||
|
|
||||||
|
Conjugation : Type ; -- Parameter to mkV*
|
||||||
first : Conjugation ; -- "гуля-Ешь, гуля-Ем"
|
first : Conjugation ; -- "гуля-Ешь, гуля-Ем"
|
||||||
firstE : Conjugation ; -- Verbs with vowel "ё": "даёшь" (give), "пьёшь" (drink)
|
firstE : Conjugation ; -- Verbs with vowel "ё": "даёшь" (give), "пьёшь" (drink)
|
||||||
second : Conjugation ; -- "вид-Ишь, вид-Им"
|
second : Conjugation ; -- "вид-Ишь, вид-Им"
|
||||||
@@ -186,25 +190,10 @@ mixed: Conjugation; -- "хоч-Ешь - хот-Им"
|
|||||||
dolzhen : Conjugation ; -- irregular
|
dolzhen : Conjugation ; -- irregular
|
||||||
foreign: Conjugation; -- deprecated, not needed
|
foreign: Conjugation; -- deprecated, not needed
|
||||||
|
|
||||||
|
Bool: Type;
|
||||||
true: Bool;
|
true: Bool;
|
||||||
false: Bool;
|
false: Bool;
|
||||||
|
|
||||||
active: Voice ;
|
|
||||||
passive: Voice ;
|
|
||||||
imperfective: Aspect;
|
|
||||||
perfective: Aspect ;
|
|
||||||
|
|
||||||
|
|
||||||
-- The worst case need 6 forms of the present tense in indicative mood
|
|
||||||
-- ("я бегу", "ты бежишь", "он бежит", "мы бежим", "вы бежите", "они бегут"),
|
|
||||||
-- a past form (singular, masculine: "я бежал"), an imperative form
|
|
||||||
-- (singular, second person: "беги"), an infinitive ("бежать").
|
|
||||||
-- Inherent aspect should also be specified.
|
|
||||||
|
|
||||||
-- mkVerbum : Aspect -> (presentSgP1,presentSgP2,presentSgP3,
|
|
||||||
mkV : Aspect -> (presSg1,presSg2,presSg3,presPl1,presPl2,presPl3,pastSgMasc,imp,inf: Str) -> V ;
|
|
||||||
|
|
||||||
-- Common conjugation patterns are two conjugations:
|
-- Common conjugation patterns are two conjugations:
|
||||||
-- first - verbs ending with "-ать/-ять" and second - "-ить/-еть".
|
-- first - verbs ending with "-ать/-ять" and second - "-ить/-еть".
|
||||||
-- Instead of 6 present forms of the worst case, we only need
|
-- Instead of 6 present forms of the worst case, we only need
|
||||||
@@ -216,7 +205,18 @@ perfective: Aspect ;
|
|||||||
-- So the definition for verb "любить" looks like:
|
-- So the definition for verb "любить" looks like:
|
||||||
-- regV Imperfective Second "люб" "лю" "любил" "люби" "любить";
|
-- regV Imperfective Second "люб" "лю" "любил" "люби" "любить";
|
||||||
|
|
||||||
regV :Aspect -> Conjugation -> (stemPresSg1,endPresSg1,pastSg1,imp,inf : Str) -> V ;
|
regV : Aspect -> Conjugation -> (stemPresSg1,endPresSg1,pastSg1,imp,inf : Str) -> V ; -- Example for verb "любить": `regV Imperfective Second "люб" "лю" "любил" "люби" "любить"`
|
||||||
|
|
||||||
|
-- The worst case need 6 forms of the present tense in indicative mood
|
||||||
|
-- ("я бегу", "ты бежишь", "он бежит", "мы бежим", "вы бежите", "они бегут"),
|
||||||
|
-- a past form (singular, masculine: "я бежал"), an imperative form
|
||||||
|
-- (singular, second person: "беги"), an infinitive ("бежать").
|
||||||
|
-- Inherent aspect should also be specified.
|
||||||
|
|
||||||
|
-- mkVerbum : Aspect -> (presentSgP1,presentSgP2,presentSgP3,
|
||||||
|
mkV : Aspect -> (presSg1,presSg2,presSg3,presPl1,presPl2,presPl3,pastSgMasc,imp,inf: Str) -> V ; -- The worst case need 6 forms of the present tense in indicative mood ("я бегу", "ты бежишь", "он бежит", "мы бежим", "вы бежите", "они бегут"), a past form (singular, masculine: "я бежал"), an imperative form (singular, second person: "беги"), an infinitive ("бежать"). Inherent aspect should also be specified.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- Two-place verbs, and the special case with direct object. Notice that
|
-- Two-place verbs, and the special case with direct object. Notice that
|
||||||
|
|||||||
Reference in New Issue
Block a user