conservatory
/
ikarus
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Applied a patch fixing error when the standard input/output ports 

are closed before the interactive session terminates.
This commit is contained in:
Abdulaziz Ghuloum 2008-08-03 13:50:20 -07:00
parent 6d52912aef
commit c5381d4cb3
2 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
scheme/ikarus.cafe.ss
View File

@ -53,48 +53,58 @@ description:
(display ">" (console-output-port))
(display-prompt (fx+ i 1))))))
(define my-read
(lambda (k)
(parameterize ([interrupt-handler
(lambda ()
(define (print-ex ex)
(flush-output-port (console-output-port))
(display "Unhandled exception\n" (console-error-port))
(print-condition ex (console-error-port)))
(define (reset k)
(reset-input-port! (console-input-port))
(newline (console-output-port))
(k))])
(read (console-input-port)))))
(k))
(define wait
(lambda (eval-proc escape-k)
(call/cc
(lambda (k)
(with-exception-handler
(lambda (con)
(reset-input-port! (console-input-port))
(k (void)))
(lambda ()
(with-exception-handler
(lambda (con)
(flush-output-port (console-output-port))
(display "Unhandled exception\n" (console-error-port))
(print-condition con (console-error-port))
(when (interrupted-condition? con)
(raise-continuable con)))
(lambda ()
(display-prompt 0)
(let ([x (my-read k)])
(let ([x (with-exception-handler
(lambda (ex)
(cond [(lexical-violation? ex)
(print-ex ex)
(reset k)]
[(interrupted-condition? ex)
(flush-output-port (console-output-port))
(newline (console-output-port))
(reset k)]
[else (raise-continuable ex)]))
(lambda ()
(read (console-input-port))))])
(cond
[(eof-object? x)
(newline (console-output-port))
(escape-k (void))]
[else
(call-with-values
(lambda () (eval-proc x))
(lambda ()
(with-exception-handler
(lambda (ex)
(if (non-continuable-violation? ex)
(reset k)
(raise-continuable ex)))
(lambda ()
(with-exception-handler
(lambda (ex)
(print-ex ex)
(when (serious-condition? ex)
(reset k)))
(lambda ()
(eval-proc x))))))
(lambda v*
(unless (andmap (lambda (v) (eq? v (void))) v*)
(for-each
(lambda (v)
(pretty-print v (console-output-port)))
v*))))]))))))))
v*))))]))))
(wait eval-proc escape-k)))
(define do-new-cafe

2
scheme/last-revision
View File

@ -1 +1 @@
1567
1568