remove the genitive case. Instead the pronouns have a separate gen field

This commit is contained in:
krasimir
2008-02-21 11:27:53 +00:00
parent e17235893d
commit 16ce34eee7
3 changed files with 8 additions and 7 deletions

View File

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

View File

@@ -18,7 +18,7 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
in det.s ! cn.g ! c ++ cn.s ! nf ;
a = {gn = gennum cn.g det.n; p = P3} ;
} ;
UsePron p = p ;
UsePron p = {s = p.s; a=p.a} ;
DetSg quant ord = {
s = \\g,c => quant.s ! gennum g Sg ++
@@ -38,7 +38,7 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
} ;
PossPron p = {
s = \\gn => p.s ! Gen (aform gn Def Nom) ;
s = \\gn => p.gen ! aform gn Indef Nom ;
spec = Indef
} ;

View File

@@ -18,7 +18,7 @@ resource ResBul = ParamX ** open Prelude in {
-- This is the worst-case $Case$ needed for pronouns.
param
Case = Nom | Acc | Gen AForm ;
Case = Nom | Acc ;
NForm =
NF Number Species
@@ -426,13 +426,13 @@ resource ResBul = ParamX ** open Prelude in {
gn = gn
} ;
mkNP : (az,men,moj,moia,moiat,moia_,moiata,moe,moeto,moi,moite : Str) -> GenNum -> Person -> {s : Case => Str ; a : Agr} =
mkNP : (az,men,moj,moia,moiat,moia_,moiata,moe,moeto,moi,moite : Str) -> GenNum -> Person -> {s : Case => Str; gen : AForm => Str; a : Agr} =
\az,men,moj,moia,moiat,moia_,moiata,moe,moeto,moi,moite,gn,p -> {
s = table {
Nom => az ;
Acc => men ;
Gen aform => (mkAdjective moj moia moiat moia_ moiata moe moeto moi moite).s ! aform
Acc => men
} ;
gen = (mkAdjective moj moia moiat moia_ moiata moe moeto moi moite).s ;
a = {
gn = gn ;
p = p