updated all resource langs to Digits (russian, arabic not complete)

This commit is contained in:
aarne
2007-12-18 09:55:24 +00:00
parent 2d5f98dc05
commit f85ead01b3
23 changed files with 292 additions and 83 deletions

View File

@@ -49,9 +49,9 @@ concrete CatAra of Cat = CommonX - [Utt] ** open ResAra, Prelude, ParamX in {
Num, Ord = {s : Gender => State => Case => Str ;
n : Size };
Predet = ResAra.Predet ;
QuantSg, QuantPl =
{s : Species => Gender => Case => Str;
n : ResAra.Number; d : State; isNum : Bool} ;
--- DEPREC QuantSg, QuantPl =
--- {s : Species => Gender => Case => Str;
--- n : ResAra.Number; d : State; isNum : Bool} ;
Det = ResAra.Det ;
-- {s : Species => Gender => Case => Str ; d : State; n : Size; isNum : Bool } ;
Quant = {s : ResAra.Number => Species => Gender => Case => Str; d : State} ;
@@ -62,7 +62,7 @@ concrete CatAra of Cat = CommonX - [Utt] ** open ResAra, Prelude, ParamX in {
-- Numeral
Numeral = {s : Gender => State => Case => Str ;
Numeral,Digits = {s : Gender => State => Case => Str ;
n : Size } ;

View File

@@ -38,16 +38,19 @@ concrete NounAra of Noun = CatAra ** open ResAra, Prelude in {
} ;
DetSg quant ord = {
s = quant.s ; --++ ord.s
s = \\h,g,c =>
quant.s ! Sg ! h ! g ! c ;
---- s = quant.s ; --++ ord.s -- AR 18/12/2007
n = One;
d = quant.d;
isNum = quant.isNum
isNum = False ---- quant.isNum
} ;
DetPl quant num ord = {
s = \\h,g,c =>
quant.s ! h ! g ! c ++ num.s ! g ! (toDef quant.d num.n) ! c ;
quant.s ! Pl ! h ! g ! c ++ -- AR 18/12/2007 ??
num.s ! g ! (toDef quant.d num.n) ! c ;
n = num.n;
d = quant.d;
isNum =
@@ -57,8 +60,9 @@ concrete NounAra of Noun = CatAra ** open ResAra, Prelude in {
};
} ;
SgQuant quant = {s = quant.s ! Sg ; n = Sg; d = quant.d; isNum = False} ;
PlQuant quant = {s = quant.s ! Pl ; n = Pl; d = quant.d; isNum = False} ;
--- DEPREC
--- SgQuant quant = {s = quant.s ! Sg ; n = Sg; d = quant.d; isNum = False} ;
--- PlQuant quant = {s = quant.s ! Pl ; n = Pl; d = quant.d; isNum = False} ;
-- PossPron p = {s = \\_ => p.s ! Gen} ;
@@ -80,7 +84,7 @@ concrete NounAra of Noun = CatAra ** open ResAra, Prelude in {
IndefArt = {s = \\_,_,_,_ => []; d = Indef} ;
MassDet = {s = \\_,_,_ => [] ; n = Sg; d = Indef; isNum = False} ;
MassDet = {s = \\_,_,_,_ => [] ; n = Sg; d = Indef; isNum = False} ;
UseN n = n ;
-- UseN2 n = n ;

View File

@@ -56,7 +56,7 @@ concrete StructuralAra of Structural = CatAra **
-- } ;
no_Phr = ss "لا" ;
on_Prep = ss "عَلى" ;
one_Quant = mkQuantNum "واحِد" Sg Indef ;
--- DEPREC one_Quant = mkQuantNum "واحِد" Sg Indef ;
only_Predet = mkPredet "فَقَط" False;
-- or_Conj = ss "ْر" ** {n = Sg} ;
-- otherwise_PConj = ss "ْتهروِسي" ;