1
0
forked from GitHub/gf-rgl

generalize the Card category

This commit is contained in:
Krasimir Angelov
2018-07-05 13:01:17 +02:00
parent c456ea3b11
commit dcd0490180
3 changed files with 6 additions and 6 deletions

View File

@@ -58,7 +58,7 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv,AdV,SC] ** open ResBul, Prelude, P
Predet = {s : GenNum => Str} ; Predet = {s : GenNum => Str} ;
Ord = {s : AForm => Str} ; Ord = {s : AForm => Str} ;
Num = {s : CardForm => Str; nn : NNumber; nonEmpty : Bool} ; Num = {s : CardForm => Str; nn : NNumber; nonEmpty : Bool} ;
Card = {s : CardForm => Str; n : Number} ; Card = {s : CardForm => Str; nn : NNumber} ;
Quant = {s : Bool => AForm => Str; nonEmpty : Bool; spec : Species; p : Polarity} ; Quant = {s : Bool => AForm => Str; nonEmpty : Bool; spec : Species; p : Polarity} ;
-- Numeral -- Numeral

View File

@@ -113,15 +113,15 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
NumSg = {s = \\_ => []; nn = NNum Sg; nonEmpty = False} ; NumSg = {s = \\_ => []; nn = NNum Sg; nonEmpty = False} ;
NumPl = {s = \\_ => []; nn = NNum Pl; nonEmpty = False} ; NumPl = {s = \\_ => []; nn = NNum Pl; nonEmpty = False} ;
NumCard n = {s=n.s; nn=case n.n of {Sg => NNum Sg; Pl => NCountable}; nonEmpty = True} ; NumCard n = {s=n.s; nn=n.nn; nonEmpty = True} ;
NumDigits n = {s = \\gspec => n.s ! NCard gspec; n = n.n} ; NumDigits n = {s = \\gspec => n.s ! NCard gspec; nn = case n.n of {Sg => NNum Sg; Pl => NCountable}} ;
OrdDigits n = {s = \\aform => n.s ! NOrd aform} ; OrdDigits n = {s = \\aform => n.s ! NOrd aform} ;
NumNumeral numeral = {s = \\gspec => numeral.s ! NCard gspec; n = numeral.n; nonEmpty = True} ; NumNumeral numeral = {s = \\gspec => numeral.s ! NCard gspec; nn = case numeral.n of {Sg => NNum Sg; Pl => NCountable}} ;
OrdNumeral numeral = {s = \\aform => numeral.s ! NOrd aform} ; OrdNumeral numeral = {s = \\aform => numeral.s ! NOrd aform} ;
AdNum adn num = {s = \\gspec => adn.s ++ num.s ! gspec; n = num.n; nonEmpty = num.nonEmpty} ; AdNum adn num = {s = \\gspec => adn.s ++ num.s ! gspec; nn = num.nn} ;
OrdSuperl a = {s = \\aform => "íàé" ++ hyphen ++ a.s ! aform} ; OrdSuperl a = {s = \\aform => "íàé" ++ hyphen ++ a.s ! aform} ;

View File

@@ -29,7 +29,7 @@ lin
SymbS sy = sy ; SymbS sy = sy ;
SymbNum sy = {s = \\_ => sy.s; n = Pl; nonEmpty = True} ; SymbNum sy = {s = \\_ => sy.s; nn = NNum Pl} ;
SymbOrd sy = {s = \\aform => sy.s ++ "-" ++ SymbOrd sy = {s = \\aform => sy.s ++ "-" ++
case aform of { case aform of {
ASg Masc Indef => "òè" ; ASg Masc Indef => "òè" ;