SubstForm in Russian is replaced with NForm like in Bulgarian and is used more widely

This commit is contained in:
krasimir
2008-11-26 19:38:51 +00:00
parent 832f25fc2a
commit 20c55c4f5a
7 changed files with 284 additions and 301 deletions

View File

@@ -74,7 +74,7 @@ oper
-- For the sake of shorter description these parameters are
-- combined in the type SubstForm.
param
SubstForm = SF Number Case ;
NForm = NF Number Case ;
-- Real parameter types (i.e. ones on which words and phrases depend)
@@ -114,14 +114,14 @@ oper
mkPronForm: Case -> AfterPrep -> Possessive -> PronForm =
\c,n,p -> PF c n p ;
CommNounPhrase: Type = {s : Number => Case => Str; g : Gender; anim : Animacy} ;
CommNoun = {s : NForm => Str ; g : Gender ; anim : Animacy } ;
NounPhrase : Type = { s : PronForm => Str ; n : Number ;
p : Person ; g: PronGen ; anim : Animacy ; pron: Bool} ;
mkNP : Number -> CommNounPhrase -> NounPhrase = \n,chelovek ->
{s = \\cas => chelovek.s ! n ! (extCase cas) ;
mkNP : Number -> CommNoun -> NounPhrase = \n,chelovek ->
{s = \\cas => chelovek.s ! NF n (extCase cas) ;
n = n ; g = PGen chelovek.g ; p = P3 ; pron =False ;
anim = chelovek.anim
} ;
@@ -387,14 +387,4 @@ oper mille : Size => Str = table {
oper gg : Str -> Gender => Str = \s -> table {_ => s} ;
-- CardOrd = NCard | NOrd ;
----2 Transformations between parameter types
--
oper
numSF: SubstForm -> Number = \sf -> case sf of { SF n _ => n } ;
caseSF: SubstForm -> Case = \sf -> case sf of { SF _ c => c } ;
}