suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some style fixes.

Browse Source
This commit is contained in:
Eli Barzilay 2013-04-26 05:06:12 -04:00
parent 17cd967462
commit a61b0e8890
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
collects/racket/format.rkt
View File

@ -90,11 +90,10 @@
[to-pad-length (max 0 (- pad-to s-length))]) [to-pad-length (max 0 (- pad-to s-length))])
(let-values ([(left-pad-length right-pad-length) (let-values ([(left-pad-length right-pad-length)
(case align-mode (case align-mode
((left) (values 0 to-pad-length)) [(left) (values 0 to-pad-length)]
((right) (values to-pad-length 0)) [(right) (values to-pad-length 0)]
((center) [(center) (values (floor (/ to-pad-length 2))
(values (floor (/ to-pad-length 2)) (ceiling (/ to-pad-length 2)))])])
(ceiling (/ to-pad-length 2)))))])
(string-append (string-append
(build-padding 'left left-padding left-pad-length) (build-padding 'left left-padding left-pad-length)
s s
@ -108,21 +107,22 @@
[(and (string? padding) (= (string-length padding) 1)) [(and (string? padding) (= (string-length padding) 1))
(make-string pad-length (string-ref padding 0))] (make-string pad-length (string-ref padding 0))]
[(string? padding) [(string? padding)
(let* ([pattern padding] (define pattern padding)
[pattern-length (string-length pattern)] (define pattern-length (string-length pattern))
[whole-copies (quotient pad-length pattern-length)] (define-values [whole-copies part-length]
[part-length (remainder pad-length pattern-length)] (quotient/remainder pad-length pattern-length))
[pattern-copies (for/list ([i (in-range whole-copies)]) pattern)]) (define pattern-copies
(for/list ([i (in-range whole-copies)]) pattern))
(apply string-append (apply string-append
;; For left, start at start of string ;; For left, start at start of string
;; For right, end at end of string. ;; For right, end at end of string.
(case side (case side
((left) [(left)
(append pattern-copies (append pattern-copies
(list (substring pattern 0 part-length)))) (list (substring pattern 0 part-length)))]
((right) [(right)
(cons (substring pattern (- pattern-length part-length) pattern-length) (cons (substring pattern (- pattern-length part-length) pattern-length)
pattern-copies)))))])) pattern-copies)]))]))
(define (do-checks who limit limit-marker width) (define (do-checks who limit limit-marker width)
(when (> width limit) (when (> width limit)
@ -188,7 +188,7 @@
#:pad-string [digits-padding " "]) #:pad-string [digits-padding " "])
(let ([notation (if (procedure? notation) (notation N) notation)]) (let ([notation (if (procedure? notation) (notation N) notation)])
(case notation (case notation
((exponential) [(exponential)
(catne N (catne N
#:who 'catn #:who 'catn
#:sign sign-mode #:sign sign-mode
@ -196,15 +196,15 @@
#:precision precision #:precision precision
#:format-exponent exp-format-exponent #:format-exponent exp-format-exponent
#:pad-digits-to pad-digits-to #:pad-digits-to pad-digits-to
#:digits-padding digits-padding)) #:digits-padding digits-padding)]
((positional) [(positional)
(catnp N (catnp N
#:who 'catn #:who 'catn
#:sign sign-mode #:sign sign-mode
#:base base #:base base
#:precision precision #:precision precision
#:pad-digits-to pad-digits-to #:pad-digits-to pad-digits-to
#:digits-padding digits-padding))))) #:digits-padding digits-padding)])))
(define (catnp N (define (catnp N
#:who [who 'catnp] #:who [who 'catnp]
@ -372,11 +372,11 @@
(values (car indicator) (cadr indicator)))) (values (car indicator) (cadr indicator))))
(let ([indicator-table (let ([indicator-table
(case sign-mode (case sign-mode
((#f) '("" "" "-")) [(#f) '("" "" "-")]
((+) '("+" "" "-")) [(+) '("+" "" "-")]
((++) '("+" "+" "-")) [(++) '("+" "+" "-")]
((parens) '("" "" ("(" ")"))) [(parens) '("" "" ("(" ")"))]
(else sign-mode))]) [else sign-mode])])
(cond [(or (negative? N) (eqv? -0.0 N)) (cond [(or (negative? N) (eqv? -0.0 N))
(get (caddr indicator-table))] (get (caddr indicator-table))]
[(zero? N) [(zero? N)