From 3b100da9ada9171d873a796eaf3351d4fceed394 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 22 Feb 2016 16:36:12 +0100 Subject: tests/gpgscm: Make exception value available. * tests/gpgscm/init.scm (throw): Hand exception value to the handler. (catch): And bind it to *error*. --- tests/gpgscm/init.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/gpgscm/init.scm b/tests/gpgscm/init.scm index 630f27a70..0889366af 100644 --- a/tests/gpgscm/init.scm +++ b/tests/gpgscm/init.scm @@ -542,8 +542,9 @@ ; (if-something goes-wrong) ; (with-these calls)) ; -; "Catch" establishes a scope spanning multiple call-frames -; until another "catch" is encountered. +; "Catch" establishes a scope spanning multiple call-frames until +; another "catch" is encountered. Within the recovery expression +; the thrown exception is bound to *error*. ; ; Exceptions are thrown with: ; @@ -566,13 +567,13 @@ (define (throw . x) (if (more-handlers?) - (apply (pop-handler)) + (apply (pop-handler) x) (apply error x))) (macro (catch form) (let ((label (gensym))) `(call/cc (lambda (exit) - (push-handler (lambda () (exit ,(cadr form)))) + (push-handler (lambda (*error*) (exit ,(cadr form)))) (let ((,label (begin ,@(cddr form)))) (pop-handler) ,label))))) -- cgit v1.2.3