From: Christopher Allan Webber Date: Sat, 28 Nov 2015 04:14:13 +0000 (-0600) Subject: switch %8sync-caught-error to 8sync-caught-error X-Git-Tag: v0.1.0~56 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=cfccc4dee6478d80e2f45f72c0ab83b776d99503;p=8sync.git switch %8sync-caught-error to 8sync-caught-error --- diff --git a/eightsync/agenda.scm b/eightsync/agenda.scm index edade13..27c0d7d 100644 --- a/eightsync/agenda.scm +++ b/eightsync/agenda.scm @@ -479,7 +479,7 @@ return the wrong thing via (%8sync) and trip themselves up." (define-syntax-rule (propagate-%async-exceptions body) (let ((body-result body)) (if (wrapped-exception? body-result) - (throw '%8sync-caught-error + (throw '8sync-caught-error (wrapped-exception-key body-result) (wrapped-exception-args body-result) (wrapped-exception-stacks body-result)) @@ -515,7 +515,7 @@ return the wrong thing via (%8sync) and trip themselves up." ;; @@: For this stack to work doesn't it have to be (lambda (key . args) (cond - ((eq? key '%8sync-caught-error) + ((eq? key '8sync-caught-error) (match args ((orig-key orig-args orig-stacks) (make-wrapped-exception @@ -546,7 +546,7 @@ return the wrong thing via (%8sync) and trip themselves up." body ...))))) (define-syntax-rule (catch-8sync exp (handler-key handler) ...) - (catch '%8sync-caught-error + (catch '8sync-caught-error (lambda () exp) (lambda (_ orig-key orig-args orig-stacks) @@ -554,7 +554,7 @@ return the wrong thing via (%8sync) and trip themselves up." ((or (eq? handler-key #t) (eq? orig-key handler-key)) (apply handler orig-stacks orig-args)) ... - (else (raise '%8sync-caught-error + (else (raise '8sync-caught-error orig-key orig-args orig-stacks)))))) ;; Alias...? diff --git a/tests/test-agenda.scm b/tests/test-agenda.scm index a41be0a..9ab65f1 100644 --- a/tests/test-agenda.scm +++ b/tests/test-agenda.scm @@ -400,7 +400,7 @@ (catch-8sync (begin (speaker "hello") - (throw '%8sync-caught-error + (throw '8sync-caught-error 'my-orig-key '(apple orange banana) '(*fake-stack* *fake-stack* *fake-stack*)) (speaker "no goodbyes")) ('some-key