GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 08:58:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

added pot3as4 and potas5

Browse Source
This commit is contained in:
Krasimir Angelov
2025-08-29 08:33:35 +02:00
parent f546600fd2
commit 4644ef0229
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/danish/NumeralDan.gf
View File

@@ -7,7 +7,7 @@ concrete NumeralDan of Numeral = CatDan [Numeral,Digits,Decimal] ** open MorphoD
lincat lincat
Digit = {s : DForm => CardOrd => Str} ; Digit = {s : DForm => CardOrd => Str} ;
Sub10 = {s : DForm => CardOrd => Str ; n : Number} ; Sub10 = {s : DForm => CardOrd => Str ; n : Number} ;
Sub100, Sub1000, Sub1000000 = Sub100, Sub1000, Sub1000000, Sub1000000000, Sub1000000000000 =
{s : CardOrd => Str ; n : Number} ; {s : CardOrd => Str ; n : Number} ;
lin num x = x ; lin num x = x ;
@@ -45,6 +45,9 @@ lin n9 = mkTal "ni" "nitten" "halvfems" "niende" "halvfemsindstyvende" ;
pot3 n = numPl (\\g => n.s ! invNum ++ cardOrd "tusind" "tusinde" ! g) ; pot3 n = numPl (\\g => n.s ! invNum ++ cardOrd "tusind" "tusinde" ! g) ;
pot3plus n m = {s = \\g => n.s ! invNum ++ "tusind" ++ "og" ++ m.s ! g ; n =Pl} ; pot3plus n m = {s = \\g => n.s ! invNum ++ "tusind" ++ "og" ++ m.s ! g ; n =Pl} ;
pot3as4 n = n ;
pot4as5 n = n ;
lincat lincat
Dig = TDigit ; Dig = TDigit ;

5
src/norwegian/NumeralNor.gf
View File

@@ -4,7 +4,7 @@ concrete NumeralNor of Numeral = CatNor [Numeral,Digits,Decimal] ** open MorphoN
lincat lincat
Digit = {s : DForm => CardOrd => Str} ; Digit = {s : DForm => CardOrd => Str} ;
Sub10 = {s : DForm => CardOrd => Str ; n : Number} ; Sub10 = {s : DForm => CardOrd => Str ; n : Number} ;
Sub100, Sub1000, Sub1000000 = Sub100, Sub1000, Sub1000000, Sub1000000000, Sub1000000000000 =
{s : CardOrd => Str ; n : Number} ; {s : CardOrd => Str ; n : Number} ;
lin lin
@@ -44,6 +44,9 @@ lin
pot3plus n m = pot3plus n m =
{s = \\g => n.s ! invNum ++ "tusen" ++ "og" ++ m.s ! g ; n = Pl} ; {s = \\g => n.s ! invNum ++ "tusen" ++ "og" ++ m.s ! g ; n = Pl} ;
pot3as4 n = n ;
pot4as5 n = n ;
-- Numerals from sequences of digits. -- Numerals from sequences of digits.
lincat lincat

5
src/nynorsk/NumeralNno.gf
View File

@@ -4,7 +4,7 @@ concrete NumeralNno of Numeral = CatNno [Numeral,Digits,Decimal] ** open MorphoN
lincat lincat
Digit = {s : DForm => CardOrd => Str} ; Digit = {s : DForm => CardOrd => Str} ;
Sub10 = {s : DForm => CardOrd => Str ; n : Number} ; Sub10 = {s : DForm => CardOrd => Str ; n : Number} ;
Sub100, Sub1000, Sub1000000 = Sub100, Sub1000, Sub1000000, Sub1000000000, Sub1000000000000 =
{s : CardOrd => Str ; n : Number} ; {s : CardOrd => Str ; n : Number} ;
lin lin
@@ -44,6 +44,9 @@ lin
pot3plus n m = pot3plus n m =
{s = \\g => n.s ! invNum ++ "tusen" ++ "og" ++ m.s ! g ; n = Pl} ; {s = \\g => n.s ! invNum ++ "tusen" ++ "og" ++ m.s ! g ; n = Pl} ;
pot3as4 n = n ;
pot4as5 n = n ;
-- Numerals from sequences of digits. -- Numerals from sequences of digits.
lincat lincat