msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

NumeralSwe: fem miljoner

Browse Source
This commit is contained in:
Aarne Ranta
2024-02-06 09:03:51 +01:00
parent 1e55251235
commit d2eb7bd46d
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/abstract/Numeral.gf
View File

@@ -29,7 +29,9 @@ cat
Sub1000000000000 ; -- 1..999999999999
data
num : Sub1000000 -> Numeral ; -- 123456 [coercion to top category]
---- num : Sub1000000000000 -> Numeral ; ---- should be this, but not yet available in most langs AR 6/2/2024
n2, n3, n4, n5, n6, n7, n8, n9 : Digit ;

17
src/swedish/NumeralSwe.gf
View File

@@ -1,3 +1,5 @@
--# -path=.:../abstract
concrete NumeralSwe of Numeral = CatSwe [Numeral,Digits,Decimal] ** open ResSwe, MorphoSwe, Prelude in {
flags coding=utf8 ;
@@ -50,21 +52,24 @@ lin
{s = \\g => n.s ! invNum ++ BIND ++ "tusen" ++ m.s ! g ; n = Pl} ;
pot3as4 n = n ;
pot41 = numPl (cardOrd "miljon" "miljonde") ;
pot41 = numPl (cardOrd "en miljon" "miljonde") ;
pot4 n =
numPl (\\g => n.s ! NCard Utr ++
cardOrd (case n.n of {
Sg => "miljon" ;
Pl => "miljoner"
})
"miljonde" ! g) ;
"miljonte" ! g) ;
pot4plus n m =
{s = \\g => n.s ! NCard Utr ++ BIND ++ "miljon" ++ m.s ! g ; n = Pl} ;
{s = \\g => n.s ! NCard Utr ++ case n.n of {
Sg => "miljon" ;
Pl => "miljoner"
} ++ m.s ! g ; n = Pl} ;
pot4as5 n = n ;
pot4decimal d =
numPl (\\g => d.s ! NCard Utr ++ cardOrd "miljoner" "miljonde" ! g) ;
numPl (\\g => d.s ! NCard Utr ++ cardOrd "miljoner" "miljonte" ! g) ;
pot51 = numPl (cardOrd "miljard" "miljarde") ;
pot51 = numPl (cardOrd "en miljard" "miljarde") ;
pot5 n =
numPl (\\g => n.s ! NCard Utr ++
cardOrd (case n.n of {
@@ -73,7 +78,7 @@ lin
})
"miljarde" ! g) ;
pot5plus n m =
{s = \\g => n.s ! NCard Utr ++ BIND ++ "miljard" ++ m.s ! g ; n = Pl} ;
{s = \\g => n.s ! NCard Utr ++ "miljard" ++ m.s ! g ; n = Pl} ;
pot5decimal d =
numPl (\\g => d.s ! NCard Utr ++ cardOrd "miljarder" "miljarde" ! g) ;