Movatterモバイル変換

[0]ホーム
URL:

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

Commit84f28ff

Browse files
committed
Improve support for allow_stdin and silent
1 parente3fd986 commit84f28ff

File tree

3 files changed

+42
-12
lines changed

3 files changed

+42
-12
lines changed

‎src/kernel.lisp‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
(in-package#:jupyter)
22

3-
(defvar*enable-debugger*nil)
3+
(defvar*stdout*nil)
4+
(defvar*stdin*nil)
5+
(defvar*stderr*nil)
6+
(defvar*enable-debugger*t)
7+
(defvar*enable-internal-debugger*t)
48
(defvar*payload*nil)
59
(defvar*markdown-output*nil)
610
(defvar*html-output*nil)
@@ -711,7 +715,8 @@
711715
(mezzano.debug:*global-debugger*:external)
712716
#+sbcl
713717
(sb-ext:*invoke-debugger-hook*:external)
714-
(t:internal)))
718+
(*enable-internal-debugger*:internal)
719+
(t:none)))
715720

716721
(defmacrowith-debugger ((&key control internal)&body body)
717722
(let ((debugger-hook (if control
@@ -942,9 +947,12 @@
942947
(prog* ((shell (kernel-shell kernel))
943948
(iopub (kernel-iopub kernel))
944949
(*thread-id* (add-thread kernel))
945-
(*standard-input* (kernel-standard-input kernel))
946-
(*error-output* (kernel-error-output kernel))
947-
(*standard-output* (kernel-standard-output kernel))
950+
(*stdin* (kernel-standard-input kernel))
951+
(*stdout* (kernel-standard-output kernel))
952+
(*stderr* (kernel-error-output kernel))
953+
(*standard-input* (make-synonym-stream'*stdin*))
954+
(*standard-output* (make-synonym-stream'*stdout*))
955+
(*error-output* (make-synonym-stream'*stderr*))
948956
(*debug-io* (make-two-way-stream*standard-input**standard-output*))
949957
(*query-io**debug-io*)
950958
(*terminal-io**debug-io*)
@@ -1495,13 +1503,25 @@
14951503
(inform:info*kernel*"Handling execute_request message")
14961504
(with-slots (execution-count history iopubpackagereadtable input-queue breakpoints)
14971505
*kernel*
1498-
(let ((code (gethash"code" (message-content*message*)))
1499-
(ename"interrupt")
1500-
(evalue"Execution interrupted")
1501-
traceback
1502-
(*payload* (make-array16:adjustablet:fill-pointer0))
1503-
(*page-output* (make-string-output-stream))
1504-
(*enable-debugger* (gethash"stop_on_error" (message-content*message*))))
1506+
(let* ((code (gethash"code" (message-content*message*)))
1507+
(silent (gethash"silent" (message-content*message*)))
1508+
(allow-stdin (gethash"allow_stdin" (message-content*message*)))
1509+
(ename"interrupt")
1510+
(evalue"Execution interrupted")
1511+
traceback
1512+
(*payload* (make-array16:adjustablet:fill-pointer0))
1513+
(*page-output* (make-string-output-stream))
1514+
(*enable-debugger* (and (gethash"stop_on_error" (message-content*message*))
1515+
*enable-debugger*))
1516+
(*stderr* (if silent
1517+
(make-broadcast-stream)
1518+
*stderr*))
1519+
(*stdout* (if silent
1520+
(make-broadcast-stream)
1521+
*stdout*))
1522+
(*enable-internal-debugger* (and (not silent)
1523+
allow-stdin
1524+
*enable-internal-debugger*)))
15051525
(incf execution-count)
15061526
(add-cell history execution-count code)
15071527
(unwind-protect

‎src/utils.lisp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,11 @@
162162
(equal,ev-form,(first clause)))
163163
,@(cdr clause)))))
164164
clauses))))))
165+
166+
#+ccl
167+
(defmethodccl::input-stream-shared-resource ((ssynonym-stream))
168+
(ccl::input-stream-shared-resource (symbol-value (synonym-stream-symbol s))))
169+
170+
#+ccl
171+
(defmethod (setfccl::input-stream-shared-resource) (new (ssynonym-stream))
172+
(setf (ccl::input-stream-shared-resource (symbol-value (synonym-stream-symbol s))) new))

‎tests/test_kernel.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ def test_execute_error(jupyter_kernel):
191191
jupyter_kernel.execute_read_reply(
192192
"(/ 1 0)",
193193
timeout=10,
194+
stop_on_error=False,
194195
expected_reply=[{"content": {"status":"error","ename":"DIVISION-BY-ZERO"}}],
195196
)
196197

@@ -203,6 +204,7 @@ def test_execute_result_error(jupyter_kernel):
203204
(error "qux"))
204205
(print (make-instance 'fu))""",
205206
timeout=10,
207+
stop_on_error=False,
206208
expected_reply=[
207209
{"content": {"status":"error","ename":"SIMPLE-ERROR","evalue":"qux"}}
208210
],

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp