Add (catch-8sync) stuff

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

diff --git a/tests/test-agenda.scm b/tests/test-agenda.scm
index 691310905b29bbdc7b82b8451e9e62ba2753677f..6918c992818c625336fe4febfe41d6fa3d448dfa 100644 (file)
--- a/tests/test-agenda.scm
+++ b/tests/test-agenda.scm
@@ -394,9 +394,34 @@
                  "in here now!\n"
                  "Well that was fun :)\n")))
 
                  "in here now!\n"
                  "Well that was fun :)\n")))
 

+;; Make sure catching tools work
+
+(let ((speaker (speak-it))
+      (catch-result #f))
+  (catch-8sync
+   (begin
+     (speaker "hello")
+     (throw '%8sync-caught-error
+            'my-orig-key '(apple orange banana) '(*fake-stack* *fake-stack* *fake-stack*))
+     (speaker "no goodbyes"))
+   ('some-key
+    (lambda (stacks . rest)
+      (speaker "should not happen")))
+   ('my-orig-key
+    (lambda (stacks fruit1 fruit2 fruit3)
+      (set! catch-result
+            `((fruit1 ,fruit1)
+              (fruit2 ,fruit2)
+              (fruit3 ,fruit3))))))
+  (test-equal (speaker) '("hello"))
+  (test-equal catch-result '((fruit1 apple)
+                             (fruit2 orange)
+                             (fruit3 banana))))
+

 ;; End tests
 
 (test-end "test-agenda")
 
 ;; End tests
 
 (test-end "test-agenda")
 

+;; @@: A better way to handle this at the repl?

 (test-exit)
 
 (test-exit)