*** empty log message ***

This commit is contained in:
janna
2003-11-30 14:16:18 +00:00
parent 58077ea9ae
commit 2c2f81be18
5 changed files with 169 additions and 70 deletions

View File

@@ -457,6 +457,7 @@ oper eEndInAnimateDecl: Str -> CommNoun = \proizvedeni ->
SF Pl Gen => proizvedeni+"й" ;
SF Pl Dat => proizvedeni+"ям" ;
SF Pl Acc => proizvedeni+"я" ;
SF Pl Inst => proizvedeni+"ями" ;
SF Pl Prepos => proizvedeni+"ях"
} ;
g = Neut ; anim = Inanimate
@@ -555,7 +556,9 @@ oper EN_softSignEndDeclMasc: Str -> CommNoun = \rem ->
SF Sg Acc => rem+"ень" ;
SF Sg Inst => rem+"нем" ;
SF Sg Prepos => rem+"не" ;
SF Pl Nom => rem+"ни" ;
SF Pl Gen => rem+"ней" ;
SF Pl Dat => rem+"ням" ;
SF Pl Acc => rem+"ни" ;
SF Pl Inst => rem+"нями" ;
@@ -717,6 +720,8 @@ oper eEnd_Decl: Str -> CommNoun = \vs ->
SF Sg Dat => vs+"ем" ;
SF Sg Acc => vs+"ех" ;
SF Sg Inst => vs+"еми" ;
SF Sg Prepos => vs+"ех" ;
SF Pl Nom => vs+"е" ;
SF Pl Gen => vs +"ех";
SF Pl Dat => vs+"ем" ;
@@ -742,6 +747,7 @@ oper mkAdjDeg: Adjective -> Str -> AdjDegr = \adj, s ->
kazhdujDet: Adjective = uy_j_EndDecl "кажд" ;
samuj: Adjective = uy_j_EndDecl "сам" ;
lubojDet: Adjective = uy_oj_EndDecl "люб" ;
kotorujDet: Adjective = uy_j_EndDecl "котор";
nekotorujDet: Adjective = uy_j_EndDecl "некотор";
takoj: Adjective = i_oj_EndDecl "так" [];
kakojNibudDet: Adjective = i_oj_EndDecl "как" "-нибудь";
@@ -1001,7 +1007,7 @@ oper have: Verbum = {s=\\ vf => "-" ; asp = Imperfective} ;
AF _ _ (ASg Masc) => s;
AF _ _ (ASg Fem) => s+"а";
AF _ _ (ASg Neut) => s+"о";
AF _ _ APl => s+"ы" ;
AF _ _ APl => s+"ы" ;
AdvF => "о"
}
} ;
@@ -1012,11 +1018,16 @@ oper verbZhdat : Verbum = verbDecl Imperfective First "жд" "у" "ждал" "ж
AF _ _ APl => s+"ны" ;
AdvF => "о"
}
} ;
-- 2 Adverbs
oper vsegda: Adverb = { s = "всегда" } ;
oper chorosho: Adverb = { s = "хорошо" } ;
-- 2 Verbs
-- Dummy verbum "have" that corresponds to the phrases like
-- "I have a headache" in English. The corresponding sentence
@@ -1069,6 +1080,15 @@ oper presentConj2: Str -> Str -> PresentVerb = \del, sgP1End ->
-- so that the full type can be described as a combination
-- of the intermediate types. For example "AspectVoice"
-- is a type for defining a pattern for a particular
-- aspect and voice.
oper AspectVoice: Type = { s : VerbConj => Str ; asp: Aspect } ;
-- "PresentVerb" takes care of the present tense conjugation.
param PresentVF = PRF Number Person ;
oper PresentVerb : Type = PresentVF => Str ;
oper presentConjDolzhen: Str -> Str -> PresentVerb = \del, sgP1End ->
table {
PRF Sg P1 => del+ sgP1End ;
PRF Sg P2 => del+ sgP1End ;
@@ -1106,12 +1126,14 @@ oper verbDecl: Aspect -> Conjugation -> Str -> Str -> Str -> Str ->Str -> Verbum
PRF Pl P3 => del+ sgP1End + "т"
};
oper presentConj1: Str -> Str -> PresentVerb = \del, sgP1End ->
table {
PRF Sg P1 => del+ sgP1End ;
PRF Sg P2 => del+ "ешь" ;
PRF Sg P3 => del+ "ет" ;
PRF Pl P1 => del+ "ем" ;
PRF Pl P2 => del+ "ете'" ;
PRF Pl P3 => del+ sgP1End + "т"
};
-- "PastVerb" takes care of the past tense conjugation.