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

minor reformatting, remove unused file-size

Browse Source 
svn: r16465
This commit is contained in:
Eli Barzilay 2009-10-30 07:36:37 +00:00
parent fdb074407d
commit f0f9e995d6
1 changed files with 19 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
collects/scheme/file.ss
View File

@ -12,12 +12,12 @@
find-files find-files
pathlist-closure pathlist-closure
file->list
file->string file->string
file->bytes file->bytes
file->value file->value
file->lines file->lines
file->bytes-lines file->bytes-lines
file->list
display-to-file display-to-file
write-to-file write-to-file
display-lines-to-file) display-lines-to-file)
@ -357,21 +357,15 @@
(check-path who f) (check-path who f)
(check-file-mode who file-mode) (check-file-mode who file-mode)
(let ([sz (file-size f)]) (let ([sz (file-size f)])
(call-with-input-file* (call-with-input-file* f #:mode file-mode
f (lambda (in)
#:mode file-mode ;; There's a good chance that `file-size' gets all the data:
(lambda (in) (let ([s (read-x sz in)])
;; There's a good chance that `file-size' gets all the data: ;; ... but double-check:
(let ([s (read-x sz in)]) (let ([more (let loop ()
;; ... but double-check: (let ([l (read-x 4096 in)])
(let ([more (let loop () (if (eof-object? l) null (cons l (loop)))))])
(let ([l (read-x 4096 in)]) (if (null? more) s (apply x-append (cons s more)))))))))
(if (eof-object? l)
null
(cons l (loop)))))])
(if (null? more)
s
(apply x-append (cons s more)))))))))
(define (file->string f #:mode [mode 'binary]) (define (file->string f #:mode [mode 'binary])
(file->x 'file->string f mode read-string string-append)) (file->x 'file->string f mode read-string string-append))
@ -382,29 +376,19 @@
(define (file->value f #:mode [file-mode 'binary]) (define (file->value f #:mode [file-mode 'binary])
(check-path 'file->value f) (check-path 'file->value f)
(check-file-mode 'file->value file-mode) (check-file-mode 'file->value file-mode)
(let ([sz (file-size f)]) (call-with-input-file* f #:mode file-mode read))
(call-with-input-file*
f
#:mode file-mode
read)))
(define (file->list f [r read] #:mode [file-mode 'binary]) (define (file->list f [r read] #:mode [file-mode 'binary])
(check-path 'file->list f) (check-path 'file->list f)
(check-file-mode 'file->list file-mode) (check-file-mode 'file->list file-mode)
(let ([sz (file-size f)]) (call-with-input-file* f #:mode file-mode (lambda (p) (port->list r p))))
(call-with-input-file*
f
#:mode file-mode
(lambda (p) (port->list r p)))))
(define (file->x-lines who f line-mode file-mode read-line) (define (file->x-lines who f line-mode file-mode read-line)
(check-path who f) (check-path who f)
(check-mode who line-mode) (check-mode who line-mode)
(check-file-mode who file-mode) (check-file-mode who file-mode)
(call-with-input-file* (call-with-input-file* f #:mode file-mode
f (lambda (p) (port->x-lines who p line-mode read-line))))
#:mode file-mode
(lambda (p) (port->x-lines who p line-mode read-line))))
(define (file->lines f #:line-mode [line-mode 'any] #:mode [file-mode 'binary]) (define (file->lines f #:line-mode [line-mode 'any] #:mode [file-mode 'binary])
(file->x-lines 'file->lines f line-mode file-mode read-line)) (file->x-lines 'file->lines f line-mode file-mode read-line))
@ -419,29 +403,19 @@
(raise-type-error who "'binary or 'text" mode)) (raise-type-error who "'binary or 'text" mode))
(unless (memq exists '(error append update replace truncate truncate/replace)) (unless (memq exists '(error append update replace truncate truncate/replace))
(raise-type-error who "'error, 'append, 'update, 'replace, 'truncate, or 'truncate/replace" exists)) (raise-type-error who "'error, 'append, 'update, 'replace, 'truncate, or 'truncate/replace" exists))
(call-with-output-file* (call-with-output-file* f #:mode mode #:exists exists write))
f
#:mode mode
#:exists exists
write))
(define (display-to-file s f (define (display-to-file s f #:mode [mode 'binary] #:exists [exists 'error])
#:mode [mode 'binary]
#:exists [exists 'error])
(->file 'display-to-file f mode exists (lambda (p) (display s p)))) (->file 'display-to-file f mode exists (lambda (p) (display s p))))
(define (write-to-file s f (define (write-to-file s f #:mode [mode 'binary] #:exists [exists 'error])
#:mode [mode 'binary]
#:exists [exists 'error])
(->file 'write-to-file f mode exists (lambda (p) (write s p)))) (->file 'write-to-file f mode exists (lambda (p) (write s p))))
(define (display-lines-to-file l f (define (display-lines-to-file l f
#:mode [mode 'binary] #:mode [mode 'binary]
#:exists [exists 'error] #:exists [exists 'error]
#:separator [newline #"\n"]) #:separator [newline #"\n"])
(unless (list? l) (unless (list? l)
(raise-type-error 'display-lines-to-file "list" l)) (raise-type-error 'display-lines-to-file "list" l))
(->file 'display-lines-to-file f mode exists (->file 'display-lines-to-file f mode exists
(lambda (p) (lambda (p) (do-lines->port l p newline))))
(do-lines->port l p newline))))