add Predet

This commit is contained in:
krasimir
2008-02-21 11:33:20 +00:00
parent 8b2003cd80
commit 345570fa5d
3 changed files with 19 additions and 10 deletions

View File

@@ -41,7 +41,8 @@ concrete CatBul of Cat = CommonX ** open ResBul, Prelude in {
NP = {s : Case => Str; a : Agr} ; NP = {s : Case => Str; a : Agr} ;
Pron = {s : Case => Str; gen : AForm => Str; a : Agr} ; Pron = {s : Case => Str; gen : AForm => Str; a : Agr} ;
Det = {s : DGender => Case => Str ; n : Number; countable : Bool; spec : Species} ; Det = {s : DGender => Case => Str ; n : Number; countable : Bool; spec : Species} ;
Predet, Ord = {s : AForm => Str; nonEmpty : Bool} ; Predet = {s : GenNum => Str} ;
Ord = {s : AForm => Str; nonEmpty : Bool} ;
Num = {s : DGenderSpecies => Str; n : Number; nonEmpty : Bool} ; Num = {s : DGenderSpecies => Str; n : Number; nonEmpty : Bool} ;
Quant = {s : GenNum => Str; spec : Species} ; Quant = {s : GenNum => Str; spec : Species} ;

View File

@@ -21,6 +21,16 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
UsePN pn = {s = \\_ => pn.s; a = {gn = GSg pn.g; p = P3}} ; UsePN pn = {s = \\_ => pn.s; a = {gn = GSg pn.g; p = P3}} ;
UsePron p = {s = p.s; a=p.a} ; UsePron p = {s = p.s; a=p.a} ;
PredetNP pred np = {
s = \\c => pred.s ! np.a.gn ++ np.s ! c ;
a = np.a
} ;
PPartNP np v2 = {
s = \\c => np.s ! c ++ v2.s ! VPassive (aform np.a.gn Indef c) ;
a = np.a
} ;
DetSg quant ord = { DetSg quant ord = {
s = \\g,c => quant.s ! gennum g Sg ++ s = \\g,c => quant.s ! gennum g Sg ++
ord.s ! aform (gennum g Sg) quant.spec c ; ord.s ! aform (gennum g Sg) quant.spec c ;

View File

@@ -6,9 +6,9 @@ concrete StructuralBul of Structural = CatBul **
lin lin
above_Prep = ss "íàä" ; above_Prep = ss "íàä" ;
after_Prep = ss "ñëåä" ; after_Prep = ss "ñëåä" ;
{- all_Predet = ss "all" ; all_Predet = {s = table GenNum ["âñè÷êèÿ";"âñè÷êàòà";"âñè÷êîòî";"âñè÷êèòå"]} ;
almost_AdA, almost_AdN = ss "almost" ; almost_AdA, almost_AdN = ss "ïî÷òè" ;
although_Subj = ss "although" ; {- although_Subj = ss "although" ;
always_AdV = ss "always" ; always_AdV = ss "always" ;
and_Conj = ss "and" ** {n = Pl} ; and_Conj = ss "and" ** {n = Pl} ;
-} -}
@@ -65,10 +65,8 @@ concrete StructuralBul of Structural = CatBul **
it_Pron = mkNP "òî" "íåãî" "íåãîâ" "íåãîâèÿ" "íåãîâèÿò" "íåãîâà" "íåãîâàòà" "íåãîâî" "íåãîâîòî" "íåãîâè" "íåãîâèòå" (GSg Neut) P3 ; it_Pron = mkNP "òî" "íåãî" "íåãîâ" "íåãîâèÿ" "íåãîâèÿò" "íåãîâà" "íåãîâàòà" "íåãîâî" "íåãîâîòî" "íåãîâè" "íåãîâèòå" (GSg Neut) P3 ;
less_CAdv = ss "ïîìàëêî" ; less_CAdv = ss "ïîìàëêî" ;
many_Det = mkDeterminerPl "ìíîãî" ; many_Det = mkDeterminerPl "ìíîãî" ;
more_CAdv = ss "ïîâå÷å" ; more_CAdv = ss "îùå" ;
{- most_Predet = {s = \\_ => "ïîâå÷åòî"} ;
most_Predet = ss "most" ;
-}
much_Det = mkDeterminerSg "ìíîãî" "ìíîãî" "ìíîãî"; much_Det = mkDeterminerSg "ìíîãî" "ìíîãî" "ìíîãî";
{- {-
must_VV = { must_VV = {
@@ -86,9 +84,9 @@ concrete StructuralBul of Structural = CatBul **
-} -}
no_Phr = ss "íå" ; no_Phr = ss "íå" ;
on_Prep = ss "íà" ; on_Prep = ss "íà" ;
{-
---- one_Quant = mkDeterminer Sg "one" ; -- DEPRECATED ---- one_Quant = mkDeterminer Sg "one" ; -- DEPRECATED
only_Predet = ss "only" ; only_Predet = {s = \\_ => "ñàìî"} ;
{-
or_Conj = ss "or" ** {n = Sg} ; or_Conj = ss "or" ** {n = Sg} ;
otherwise_PConj = ss "otherwise" ; otherwise_PConj = ss "otherwise" ;
-} -}