Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-12 07:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing exception handlers for threadless builds.

Browse source
This commit is contained in:
Alex Shinn 2013-02-27 20:57:40 +09:00
parent a61cebb1e9
commit 6af5f46721
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/init-7.scm
View file

@ -890,13 +890,22 @@
(define (raise-continuable exn) (define (raise-continuable exn)
(raise (list *continuable* exn))) (raise (list *continuable* exn)))
(cond-expand
(threads
(define (%with-exception-handler handler thunk) (define (%with-exception-handler handler thunk)
(let* ((old (thread-parameters)) (let* ((old (thread-parameters))
(new (cons (cons current-exception-handler handler) old))) (new (cons (cons current-exception-handler handler) old)))
(dynamic-wind (dynamic-wind
(lambda () (thread-parameters-set! new)) (lambda () (thread-parameters-set! new))
thunk thunk
(lambda () (thread-parameters-set! old))))) (lambda () (thread-parameters-set! old))))))
(else
(define (%with-exception-handler handler thunk)
(let ((old (current-exception-handler)))
(dynamic-wind
(lambda () (current-exception-handler handler))
thunk
(lambda () (current-exception-handler old)))))))
(define (with-exception-handler handler thunk) (define (with-exception-handler handler thunk)
(letrec ((orig-handler (current-exception-handler)) (letrec ((orig-handler (current-exception-handler))