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

CTRL-C while in the repl now throws back into the repl no matter 

where an exception occurs.
This commit is contained in:
Abdulaziz Ghuloum 2008-12-08 02:13:40 -05:00
parent 75d2756bd2
commit 6041597a27
2 changed files with 61 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
scheme/ikarus.cafe.ss
View File

@ -62,60 +62,57 @@ description:
(reset-input-port! (console-input-port))
(k))
(define wait
(lambda (eval-proc escape-k)
(call/cc
(lambda (k)
(display-prompt 0)
(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 ()
(define wait1
(lambda (eval-proc k escape-k)
(display-prompt 0)
(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 ()
(with-exception-handler
(lambda (ex)
(if (non-continuable-violation? ex)
(reset k)
(raise-continuable ex)))
(lambda ()
(with-exception-handler
(lambda (ex)
(if (non-continuable-violation? ex)
(reset k)
(raise-continuable ex)))
(print-ex ex)
(when (serious-condition? ex)
(reset k)))
(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*)
(with-exception-handler
(lambda (ex)
(cond
[(interrupted-condition? ex)
(flush-output-port (console-output-port))
(newline (console-output-port))
(reset k)]
[else (raise-continuable ex)]))
(lambda ()
(for-each
(lambda (v)
(pretty-print v (console-output-port)))
v*))))))]))))
(wait eval-proc escape-k)))
(eval-proc x))))))
(lambda v*
(unless (andmap (lambda (v) (eq? v (void))) v*)
(with-exception-handler
(lambda (ex)
(cond
[(interrupted-condition? ex)
(flush-output-port (console-output-port))
(newline (console-output-port))
(reset k)]
[else (raise-continuable ex)]))
(lambda ()
(for-each
(lambda (v)
(pretty-print v (console-output-port)))
v*))))))]))))
(define do-new-cafe
(lambda (eval-proc)
@ -124,7 +121,18 @@ description:
(lambda ()
(call/cc
(lambda (k)
(wait eval-proc k))))
(let loop ()
(call/cc
(lambda (k1)
(with-exception-handler
(lambda (ex)
(with-exception-handler k1
(lambda ()
(flush-output-port (console-output-port))
(newline (console-output-port))
(reset k1))))
(lambda () (wait1 eval-proc k1 k)))))
(loop)))))
(lambda () (set! eval-depth (fxsub1 eval-depth))))))
(define default-cafe-eval

2
scheme/last-revision
View File

@ -1 +1 @@
1702
1703