took back smart type of Int ; Digits type in resource and some adjustments of Det syntax (not yet for romance and russian)

This commit is contained in:
aarne
2007-12-17 18:12:46 +00:00
parent eb10ccbe7c
commit 2d5f98dc05
31 changed files with 560 additions and 96 deletions

View File

@@ -36,7 +36,7 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in {
n = Sg ;
a = quant.a
in {
s = \\g,c => quant.s ! g ! c ++
s = \\g,c => quant.s ! n ! g ! c ++
ord.s ! agrAdj g (adjfCase a c) n c ;
n = n ;
a = a
@@ -46,12 +46,13 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in {
n = num.n ;
a = quant.a
in {
s = \\g,c => quant.s ! g ! c ++
s = \\g,c => quant.s ! n ! g ! c ++
num.s ++ ord.s ! agrAdj g (adjfCase a c) n c ;
n = n ;
a = a
} ;
{- --- DEPREC
SgQuant q = {
s = q.s ! Sg ;
a = q.a
@@ -60,6 +61,7 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in {
s = q.s ! Pl ;
a = q.a
} ;
-}
PossPron p = {
s = \\n,g,c => p.s ! NPPoss (gennum g n) c ;
@@ -76,6 +78,9 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in {
} ;
OrdInt n = {s = \\_ => n.s ++ "."} ;
NumDigits numeral = {s = numeral.s ! NCard; n = numeral.n } ;
OrdDigits numeral = {s = \\af => numeral.s ! NOrd af} ;
NumNumeral numeral = {s = numeral.s ! NCard; n = numeral.n } ;
OrdNumeral numeral = {s = \\af => numeral.s ! NOrd af} ;
@@ -97,8 +102,7 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in {
} ;
MassDet = {
s = \\g,c => [] ;
n = Sg ;
s = \\_,g,c => [] ;
a = Strong
} ;