1
0
forked from GitHub/gf-core

fixed the sp form of Eng DetQuant in the presence of card and ord; the code could be simplified now

This commit is contained in:
aarne
2013-03-31 14:04:13 +00:00
parent dba883fb21
commit f3cb0ae064

View File

@@ -35,7 +35,7 @@ concrete NounEng of Noun = CatEng ** open MorphoEng, ResEng, Prelude in {
s = quant.s ! num.hasCard ! num.n ++ num.s ! Nom;
sp = \\c => case num.hasCard of {
False => quant.sp ! num.hasCard ! num.n ! c ++ num.s ! Nom ;
True => quant.sp ! num.hasCard ! num.n ! npNom ++ num.s ! npcase2case c
True => quant.s ! num.hasCard ! num.n ++ num.s ! npcase2case c
} ;
n = num.n ;
hasNum = num.hasCard
@@ -43,7 +43,7 @@ concrete NounEng of Noun = CatEng ** open MorphoEng, ResEng, Prelude in {
DetQuantOrd quant num ord = {
s = quant.s ! num.hasCard ! num.n ++ num.s ! Nom ++ ord.s ! Nom;
sp = \\c => quant.sp ! num.hasCard ! num.n ! npNom ++ num.s ! Nom ++ ord.s ! npcase2case c ;
sp = \\c => quant.s ! num.hasCard ! num.n ++ num.s ! Nom ++ ord.s ! npcase2case c ;
n = num.n ;
hasNum = True
} ;