diff --git a/src/abstract/Noun.gf b/src/abstract/Noun.gf index a826ae91b..f953e7d4e 100644 --- a/src/abstract/Noun.gf +++ b/src/abstract/Noun.gf @@ -55,6 +55,7 @@ abstract Noun = Cat ** { -- $Card$ consists of either digits or numeral words. + data NumDigits : Digits -> Card ; -- 51 NumNumeral : Numeral -> Card ; -- fifty-one @@ -62,6 +63,7 @@ abstract Noun = Cat ** { -- A $Card$ can be modified by certain adverbs. + fun AdNum : AdN -> Card -> Card ; -- almost 51 -- An $Ord$ consists of either digits or numeral words. diff --git a/src/abstract/NumeralTransfer.gf b/src/abstract/NumeralTransfer.gf index 394a7a29b..a157a20bd 100644 --- a/src/abstract/NumeralTransfer.gf +++ b/src/abstract/NumeralTransfer.gf @@ -1,4 +1,9 @@ -abstract NumeralTransfer = Numeral ** { +abstract NumeralTransfer = Numeral, Noun ** { + +fun digits2numeral : Card -> Card ; +def + digits2numeral (NumDigits d) = NumNumeral (digits2num d) ; + digits2numeral n = n ; fun digits2num : Digits -> Numeral ; def digits2num (IDig d1) = num (pot2as3 (pot1as2 (pot0as1 (dn10 d1)))) ; @@ -89,4 +94,4 @@ def nd n2 = D_2 ; nd n8 = D_8 ; nd n9 = D_9 ; -} \ No newline at end of file +}