diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-06-23 03:23:44 +0200 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-06-23 03:48:22 +0200 |
commit | 1976980d4a272fb7fc3694c734bfc6825edfc721 (patch) | |
tree | 8460db1176c64895e9968447588953fac85fe7d6 /module/text/numbers | |
parent | Remove all inline use-modules. (diff) | |
download | calp-1976980d4a272fb7fc3694c734bfc6825edfc721.tar.gz calp-1976980d4a272fb7fc3694c734bfc6825edfc721.tar.xz |
Centralize (almost) all exports to :export in define-module.
Diffstat (limited to 'module/text/numbers')
-rw-r--r-- | module/text/numbers/en.scm | 11 | ||||
-rw-r--r-- | module/text/numbers/sv.scm | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/module/text/numbers/en.scm b/module/text/numbers/en.scm index 622decd5..6a5a636d 100644 --- a/module/text/numbers/en.scm +++ b/module/text/numbers/en.scm @@ -1,14 +1,17 @@ (define-module (text numbers en) - :use-module (ice-9 format)) + :use-module (ice-9 format) + :export (number->string-cardinal + number->string-ordinal + each-string)) -(define-public (number->string-cardinal n) +(define (number->string-cardinal n) (format #f "~r" n)) -(define-public (number->string-ordinal n) +(define (number->string-ordinal n) (format #f "~:r" n)) ;; Allows extra args to handle eventual local changes. -(define-public (each-string count . _) +(define (each-string count . _) (case count [(1) "each"] [(2) "every other"] diff --git a/module/text/numbers/sv.scm b/module/text/numbers/sv.scm index b70412fb..1760f622 100644 --- a/module/text/numbers/sv.scm +++ b/module/text/numbers/sv.scm @@ -1,6 +1,9 @@ (define-module (text numbers sv) :use-module (srfi srfi-71) - :use-module (hnh util)) + :use-module (hnh util) + :export (number->string-cardinal + number->string-ordinal + each-string)) ;; only used in number->string-cardinal (define (large-prefix e) @@ -17,7 +20,7 @@ [(<= 60 e 65) "dec"] )) -(define-public (number->string-cardinal n) +(define (number->string-cardinal n) (cond [(< n 0) (string-append "minus " (number->string-cardinal (- n)))] [(= n 0) "noll"] [(= n 1) "ett"] @@ -89,7 +92,7 @@ (string-append "det stora talet " (number->string n))])) -(define*-public (number->string-ordinal +(define* (number->string-ordinal n key: a-form?) (define a-string (if a-form? "a" "e")) (cond [(>= -3 n) (format #f "~a sista" (number->string-ordinal (- n)))] @@ -146,7 +149,7 @@ ;; (each-string 2) ; => "varannan" ;; (each-string 3) ; => "var tredje" ;; (each-string 3 #t) ; => "vart tredje" -(define*-public (each-string count optional: neutrum) +(define* (each-string count optional: neutrum) (string-flatten (cons "var" |