diff options
Diffstat (limited to 'module/srfi')
-rw-r--r-- | module/srfi/srfi-11.scm | 1 | ||||
-rw-r--r-- | module/srfi/srfi-18.scm | 10 | ||||
-rw-r--r-- | module/srfi/srfi-39.scm | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/module/srfi/srfi-11.scm b/module/srfi/srfi-11.scm index 9e17d6632..afa1730f1 100644 --- a/module/srfi/srfi-11.scm +++ b/module/srfi/srfi-11.scm @@ -37,7 +37,6 @@ ;;; Code: (define-module (srfi srfi-11) - :use-module (ice-9 syncase) :export-syntax (let-values let*-values)) (cond-expand-provide (current-module) '(srfi-11)) diff --git a/module/srfi/srfi-18.scm b/module/srfi/srfi-18.scm index 925ecb304..dd92079be 100644 --- a/module/srfi/srfi-18.scm +++ b/module/srfi/srfi-18.scm @@ -151,8 +151,10 @@ (hashq-set! thread-exception-handlers ct hl) (handler obj)) (lambda () - (let ((r (thunk))) - (hashq-set! thread-exception-handlers ct hl) r)))))) + (call-with-values thunk + (lambda res + (hashq-set! thread-exception-handlers ct hl) + (apply values res)))))))) (define (current-exception-handler) (car (current-handler-stack))) @@ -249,8 +251,8 @@ (define (wrap thunk) (lambda (continuation) (with-exception-handler (lambda (obj) - (apply (current-exception-handler) (list obj)) - (apply continuation (list))) + ((current-exception-handler) obj) + (continuation)) thunk))) ;; A pass-thru to cancel-thread that first installs a handler that throws diff --git a/module/srfi/srfi-39.scm b/module/srfi/srfi-39.scm index 086751170..87154d6df 100644 --- a/module/srfi/srfi-39.scm +++ b/module/srfi/srfi-39.scm @@ -35,7 +35,6 @@ ;;; Code: (define-module (srfi srfi-39) - #:use-module (ice-9 syncase) #:use-module (srfi srfi-16) #:export (make-parameter) |