From 155733eada2b57b3c9da67f8305a8c5bc829ad93 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 27 May 2019 13:56:20 -0600 Subject: [PATCH] io: fix function name in some error messages --- racket/src/io/host/bootstrap.rkt | 3 ++- racket/src/io/port/bytes-input.rkt | 4 ++-- racket/src/io/port/read-and-peek.rkt | 13 ++++++------- racket/src/io/port/special-input.rkt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/racket/src/io/host/bootstrap.rkt b/racket/src/io/host/bootstrap.rkt index e22b2f1e72..28b1be04e3 100644 --- a/racket/src/io/host/bootstrap.rkt +++ b/racket/src/io/host/bootstrap.rkt @@ -93,7 +93,8 @@ 'free-immobile-cell free-immobile-cell 'immobile-cell-ref (lambda (ib) (ptr-ref ib _racket)) 'immobile-cell->address (lambda (b) b) - 'address->immobile-cell (lambda (b) b))) + 'address->immobile-cell (lambda (b) b) + 'set-fs-change-properties! void)) (primitive-table '#%thread (hasheq 'thread thread diff --git a/racket/src/io/port/bytes-input.rkt b/racket/src/io/port/bytes-input.rkt index eeaaafb36c..c77af85bef 100644 --- a/racket/src/io/port/bytes-input.rkt +++ b/racket/src/io/port/bytes-input.rkt @@ -56,7 +56,7 @@ (maybe-flush-stdout in) (let ([in (->core-input-port in)]) (define bstr (make-bytes amt)) - (define v (do-read-bytes! 'read-bytes in bstr 0 amt)) + (define v (do-read-bytes! who in bstr 0 amt)) (if (exact-integer? v) (if (= v amt) bstr @@ -132,7 +132,7 @@ (maybe-flush-stdout in) (let ([in (->core-input-port in)]) (define bstr (make-bytes amt)) - (define v (do-peek-bytes! 'read-bytes in bstr 0 amt skip-k)) + (define v (do-peek-bytes! who in bstr 0 amt skip-k)) (if (exact-integer? v) (if (= v amt) bstr diff --git a/racket/src/io/port/read-and-peek.rkt b/racket/src/io/port/read-and-peek.rkt index 988c9ec21a..9d87787e52 100644 --- a/racket/src/io/port/read-and-peek.rkt +++ b/racket/src/io/port/read-and-peek.rkt @@ -14,7 +14,6 @@ peek-some-bytes! read-a-byte - read-byte-via-bytes peek-a-byte peek-byte-via-bytes @@ -222,12 +221,12 @@ b] [else (end-atomic) - (read-byte-via-bytes in #:special-ok? special-ok?)])) + (read-byte-via-bytes who in #:special-ok? special-ok?)])) ;; Use the general path; may return a procedure for a special -(define (read-byte-via-bytes in #:special-ok? [special-ok? #t]) +(define (read-byte-via-bytes who in #:special-ok? [special-ok? #t]) (define bstr (make-bytes 1)) - (define v (read-some-bytes! 'read-byte in bstr 0 1 + (define v (read-some-bytes! who in bstr 0 1 #:copy-bstr? #f #:special-ok? special-ok? #:limit-special-arity? #f)) @@ -247,14 +246,14 @@ b] [else (end-atomic) - (peek-byte-via-bytes in skip-k #:special-ok? special-ok?)])) + (peek-byte-via-bytes who in skip-k #:special-ok? special-ok?)])) ;; Use the general path; may return a procedure for a special -(define (peek-byte-via-bytes in skip-k +(define (peek-byte-via-bytes who in skip-k #:special-ok? [special-ok? #t] #:progress-evt [progress-evt #f]) (define bstr (make-bytes 1)) - (define v (peek-some-bytes! 'peek-byte in bstr 0 1 skip-k + (define v (peek-some-bytes! who in bstr 0 1 skip-k #:copy-bstr? #f #:special-ok? special-ok? #:limit-special-arity? #f diff --git a/racket/src/io/port/special-input.rkt b/racket/src/io/port/special-input.rkt index a6ecefa238..29cd70b8b9 100644 --- a/racket/src/io/port/special-input.rkt +++ b/racket/src/io/port/special-input.rkt @@ -47,7 +47,7 @@ in source-name skip-k special-wrap))] [else - (extract-special-value (peek-byte-via-bytes in skip-k #:progress-evt progress-evt) + (extract-special-value (peek-byte-via-bytes who in skip-k #:progress-evt progress-evt) in source-name skip-k special-wrap)])))