X-Git-Url: https://jxself.org/git/?p=8sync.git;a=blobdiff_plain;f=eightsync%2Fagenda.scm;h=27c0d7d2371feb023853372035ad7e810391622f;hp=ba075361339f469d9047c1df0eefc3d9f36963a2;hb=cfccc4dee6478d80e2f45f72c0ab83b776d99503;hpb=a0fd0a50a742438b2c4ff5f06e684a84a5c863ca

diff --git a/eightsync/agenda.scm b/eightsync/agenda.scm
index ba07536..27c0d7d 100644
--- a/eightsync/agenda.scm
+++ b/eightsync/agenda.scm
@@ -65,6 +65,8 @@
 
             %port-request %run %run-at %run-delay
             
+            catch-8sync catch-%8sync
+
             print-error-and-continue
 
             %current-agenda
@@ -468,19 +470,19 @@ return the wrong thing via (%8sync) and trip themselves up."
               async-request))))
 
 (define-record-type <wrapped-exception>
-  (make-wrapped-exception key args stack)
+  (make-wrapped-exception key args stacks)
   wrapped-exception?
   (key wrapped-exception-key)
   (args wrapped-exception-args)
-  (stack wrapped-exception-stack))
+  (stacks wrapped-exception-stacks))
 
 (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-stack body-result))
+               (wrapped-exception-stacks body-result))
         body-result)))
 
 (define-syntax-rule (%run body ...)
@@ -512,8 +514,16 @@ return the wrong thing via (%8sync) and trip themselves up."
             ;; can address it
             ;; @@: For this stack to work doesn't it have to be
             (lambda (key . args)
-              (make-wrapped-exception key args
-                                      exception-stack))
+              (cond
+               ((eq? key '8sync-caught-error)
+                (match args
+                  ((orig-key orig-args orig-stacks)
+                   (make-wrapped-exception
+                    orig-key orig-args
+                    (cons exception-stack orig-stacks)))))
+               (else
+                (make-wrapped-exception key args
+                                        (list exception-stack)))))
             (lambda _
               (set! exception-stack (make-stack #t 1 0)))))))
       when))))
@@ -535,6 +545,22 @@ return the wrong thing via (%8sync) and trip themselves up."
        (lambda ()
          body ...)))))
 
+(define-syntax-rule (catch-8sync exp (handler-key handler) ...)
+  (catch '8sync-caught-error
+    (lambda ()
+      exp)
+    (lambda (_ orig-key orig-args orig-stacks)
+      (cond
+       ((or (eq? handler-key #t)
+            (eq? orig-key handler-key))
+        (apply handler orig-stacks orig-args)) ...
+       (else (raise '8sync-caught-error
+                    orig-key orig-args orig-stacks))))))
+
+;; Alias...?
+(define-syntax-rule (catch-%8sync rest ...)
+  (catch-8sync rest ...))
+
 
 
 ;;; Execution of agenda, and current agenda