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

Revert "try to avoid blocking once we are committed to an error"

Browse Source 
This reverts commit 40cd1ea083,
which as added accidentally.
This commit is contained in:
Matthew Flatt 2021-05-13 09:21:04 -06:00
parent 97e9a17dac
commit 227d48e732
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/racket-test/tests/json/json.rkt
View File

@ -199,12 +199,6 @@
(string->jsexpr @T{ falsetto }) =error> "string->jsexpr:" (string->jsexpr @T{ falsetto }) =error> "string->jsexpr:"
(string->jsexpr @T{ nullity }) =error> "string->jsexpr:" (string->jsexpr @T{ nullity }) =error> "string->jsexpr:"
(string->jsexpr @T{ nulliparous }) =error> "string->jsexpr:" (string->jsexpr @T{ nulliparous }) =error> "string->jsexpr:"
(let ()
(define-values (in out) (make-pipe))
(display "started" out)
(flush-output out)
(read-json in))
=error> #rx"read-json: bad input starting #\"started\""
)) ))
(test do (pred-tests) (test do (pred-tests)

11
racket/collects/json/main.rkt
View File

@ -466,17 +466,16 @@
[else (bad-input)])) [else (bad-input)]))
;; ;;
(define (bad-input [prefix #""] #:eof? [eof? #f]) (define (bad-input [prefix #""] #:eof? [eof? #f])
(define bstr (make-bytes (sub1 (error-print-width)))) (define bstr (peek-bytes (sub1 (error-print-width)) 0 i))
(define bytes-read (peek-bytes-avail! bstr 0 #f i)) (if (or (and (eof-object? bstr) (equal? prefix #""))
(if (or (and (eof-object? bytes-read) (equal? prefix #""))
eof?) eof?)
(err (string-append "unexpected end-of-file" (err (string-append "unexpected end-of-file"
(if (equal? prefix #"") (if (equal? prefix #"")
"" ""
(format "after ~e" prefix)))) (format "after ~e" prefix))))
(err (format "bad input starting ~e" (bytes-append prefix (if (number? bytes-read) (err (format "bad input starting ~e" (bytes-append prefix (if (eof-object? bstr)
(subbytes bstr 0 bytes-read) #""
#"")))))) bstr))))))
;; ;;
(read-json #t)) (read-json #t))