Add (catch-8sync) stuff

[8sync.git] / eightsync / agenda.scm

diff --git a/eightsync/agenda.scm b/eightsync/agenda.scm
index 68db42eceee7bdb981612f594eacc0b4792c3568..edade135c09499e7b08beaf86c573c01d5fb3e1e 100644 (file)
--- a/eightsync/agenda.scm
+++ b/eightsync/agenda.scm
@@ -65,6 +65,8 @@
 
             %port-request %run %run-at %run-delay
             
 
             %port-request %run %run-at %run-delay
             

+            catch-8sync catch-%8sync
+

             print-error-and-continue
 
             %current-agenda
             print-error-and-continue
 
             %current-agenda


@@ -543,6 +545,22 @@ return the wrong thing via (%8sync) and trip themselves up."
        (lambda ()
          body ...)))))
 
        (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 ...))
+

 
 \f
 ;;; Execution of agenda, and current agenda
 
 \f
 ;;; Execution of agenda, and current agenda