Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit a475729

Browse files
committed
Fix *query-io*
1 parent e77d150 commit a475729

File tree

2 files changed

+5
-25
lines changed

2 files changed

+5
-25
lines changed

‎src/iopub.lisp

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@
9696

9797
(defvar *iopub-stream-size* 1024)
9898

99-
(defclass iopub-stream (ngray:fundamental-character-output-stream
100-
ngray:fundamental-character-input-stream)
99+
(defclass iopub-stream (ngray:fundamental-character-output-stream)
101100
((channel :initarg :channel
102101
:reader iopub-stream-channel)
103102
(name :initarg :name
@@ -160,22 +159,3 @@
160159
(send-stream channel name value)
161160
(adjust-array value (array-total-size value)
162161
:fill-pointer 0))))
163-
164-
165-
;; Forward all read calls to *query-io*
166-
(defmethod ngray:stream-listen ((stream iopub-stream))
167-
(ngray:stream-listen *query-io*))
168-
169-
(defmethod ngray:stream-read-char ((stream iopub-stream))
170-
(ngray:stream-read-char *query-io*))
171-
172-
(defmethod ngray:stream-peek-char ((stream iopub-stream))
173-
(ngray:stream-peek-char *query-io*))
174-
175-
(defmethod ngray:stream-unread-char ((stream iopub-stream) char)
176-
(ngray:stream-unread-char *query-io* char))
177-
178-
(defmethod ngray:stream-line-column ((stream iopub-stream))
179-
(iopub-stream-column stream))
180-
181-

‎src/kernel.lisp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -855,12 +855,12 @@
855855
(prog* ((shell (kernel-shell kernel))
856856
(iopub (kernel-iopub kernel))
857857
(*thread-id* (add-thread kernel))
858-
(*query-io* (kernel-standard-input kernel))
859-
(*standard-input* *query-io*)
858+
(*standard-input* (kernel-standard-input kernel))
860859
(*error-output* (kernel-error-output kernel))
861860
(*standard-output* (kernel-standard-output kernel))
862-
(*debug-io* *standard-output*)
863-
(*terminal-io* *standard-output*)
861+
(*debug-io* (make-two-way-stream *standard-input* *standard-output*))
862+
(*query-io* *debug-io*)
863+
(*terminal-io* *debug-io*)
864864
(*trace-output* *standard-output*)
865865
(*html-output* (kernel-html-output kernel))
866866
(*markdown-output* (kernel-markdown-output kernel))

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /