1
0
forked from GitHub/gf-rgl

(Rus) Fix syntax in ParadigmsRus to show in synopsis; whitespace removal

This commit is contained in:
Inari Listenmaa
2020-05-24 09:35:22 +02:00
parent a5d3edc06a
commit 78ce94be88

View File

@@ -37,13 +37,13 @@ flags coding=utf8 ;
-- To abstract over gender names, we define the following identifiers.
oper
Gender : Type ;
Gender : Type ; -- Parameter for mkN*
masculine : Gender ;
feminine : Gender ;
neuter : Gender ;
-- To abstract over case names, we define the following.
Case : Type ;
Case : Type ; -- Parameter for mkPrep, mkA2, mkV2, mkV3
nominative : Case ;
genitive : Case ;
@@ -57,17 +57,17 @@ oper
-- standard for Russian textbooks.
-- To abstract over number names, we define the following.
Number : Type ;
Number : Type ; -- Parameter for mkPN
singular : Number ;
plural : Number ;
--2 Nouns
Animacy: Type ;
Animacy : Type ; -- Parameter for mkN, mkPN
animate: Animacy;
inanimate: Animacy;
animate : Animacy;
inanimate : Animacy;
-- Indeclinabe nouns: "кофе", "пальто", "ВУЗ".
@@ -87,7 +87,7 @@ oper
-- and the prepositional form after в and на, and
-- 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 {
@@ -174,36 +174,25 @@ oper
-- rather than verbs. Aspect is regarded as an inherent parameter of a verb.
-- Notice, that some forms are never used for some verbs.
Voice: Type;
Aspect: Type;
Bool: Type;
Conjugation: Type ;
Voice : Type ; -- Parameter to mkV*
active : Voice ;
passive : Voice ;
first: Conjugation; -- "гуля-Ешь, гуля-Ем"
firstE: Conjugation; -- Verbs with vowel "ё": "даёшь" (give), "пьёшь" (drink)
second: Conjugation; -- "вид-Ишь, вид-Им"
mixed: Conjugation; -- "хоч-Ешь - хот-Им"
dolzhen: Conjugation; -- irregular
foreign: Conjugation; -- deprecated, not needed
Aspect : Type ; -- Parameter to mkV*
imperfective : Aspect ;
perfective : Aspect ;
Conjugation : Type ; -- Parameter to mkV*
first : Conjugation ; -- "гуля-Ешь, гуля-Ем"
firstE : Conjugation ; -- Verbs with vowel "ё": "даёшь" (give), "пьёшь" (drink)
second : Conjugation ; -- "вид-Ишь, вид-Им"
mixed : Conjugation ; -- "хоч-Ешь - хот-Им"
dolzhen : Conjugation ; -- irregular
foreign: Conjugation; -- deprecated, not needed
true: 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 ;
Bool: Type;
true: Bool;
false: Bool;
-- Common conjugation patterns are two conjugations:
-- first - verbs ending with "-ать/-ять" and second - "-ить/-еть".
@@ -216,13 +205,24 @@ perfective: Aspect ;
-- So the definition for verb "любить" looks like:
-- 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
-- a particle can be included in a $V$.
mkV2 : V -> Str -> Case -> V2 ; -- "войти в дом"; "в", accusative
mkV2 : V -> Str -> Case -> V2 ; -- "войти в дом"; "в", accusative
mkV3 : V -> Str -> Str -> Case -> Case -> V3 ; -- "сложить письмо в конверт"
mkVS : V -> VS ;
mkVQ : V -> VQ ;