X-Git-Url: https://jxself.org/git/?p=8sync.git;a=blobdiff_plain;f=eightsync%2Fagenda.scm;h=d02ce9fbdb029330308b852ad77ea0b84c66e405;hp=2d5bc8d19679286669305a43caa43b2b587cfa83;hb=b338e79df344d5acc44bd6768eddba254ad59554;hpb=bb0d4fc5de7ca8282542d8ec5b3b4ce6389b7cce

diff --git a/eightsync/agenda.scm b/eightsync/agenda.scm
index 2d5bc8d..d02ce9f 100644
--- a/eightsync/agenda.scm
+++ b/eightsync/agenda.scm
@@ -64,7 +64,6 @@
             run-it wrap wrap-apply run run-at run-delay
 
             %port-request %run %run-at %run-delay
-            8port-request 8run 8run-at 8run-delay
             
             print-error-and-continue
 
@@ -435,40 +434,19 @@ Will produce (0 . 0) instead of a negative number, if needed."
 ;;; Asynchronous escape to run things
 ;;; =================================
 
-;; The future's in futures
-
-(define (make-future call-first on-success on-fail on-error)
-  ;; TODO: add error stuff here
-  (lambda ()
-    (let ((call-result (call-first)))
-      ;; queue up calling the 
-      (run (on-success call-result)))))
-
 (define (agenda-on-error agenda)
   (const #f))
 
 (define (agenda-on-fail agenda)
   (const #f))
 
-(define* (request-future call-first on-success
-                         #:key
-                         (agenda (%current-agenda))
-                         (on-fail (agenda-on-fail agenda))
-                         (on-error (agenda-on-error agenda))  
-                         (when #f))
-  ;; TODO: error handling
-  ;; do we need some distinction between expected, catchable errors,
-  ;; and unexpected, uncatchable ones?  Probably...?
-  (make-run-request
-   (make-future call-first on-success on-fail on-error)
-   when))
-
 (define-syntax-rule (%8sync async-request)
   "Run BODY asynchronously at a prompt, passing args to make-future.
 
 Runs things asynchronously (8synchronously?)"
-  (abort-to-prompt (current-agenda-prompt)
-                   async-request))
+  (propagate-%async-exceptions
+   (abort-to-prompt (current-agenda-prompt)
+                    async-request)))
 
 ;; Async port request and run-request meta-requests
 (define (make-async-request proc)
@@ -489,16 +467,56 @@ return the wrong thing via (%8sync) and trip themselves up."
               "Invalid request passed back via an (%8sync) procedure."
               async-request))))
 
+(define-record-type <wrapped-exception>
+  (make-wrapped-exception key args stack)
+  wrapped-exception?
+  (key wrapped-exception-key)
+  (args wrapped-exception-args)
+  (stack wrapped-exception-stack))
+
+(define-syntax-rule (propagate-%async-exceptions body)
+  (let ((body-result body))
+    (display "hi!\n")
+    (if (wrapped-exception? body-result)
+        (throw '%8sync-caught-error
+               (wrapped-exception-key body-result)
+               (wrapped-exception-args body-result)
+               (wrapped-exception-stack body-result))
+        body-result)))
+
 (define-syntax-rule (%run body ...)
   (%run-at body ... #f))
 
 (define-syntax-rule (%run-at body ... when)
+  ;; Send an asynchronous request to apply a continuation to the
+  ;; following function, then handle that as a request to the agenda
   (make-async-request
    (lambda (kont)
+     ;; We're making a run request
      (make-run-request
+      ;; Wrapping the following execution to run...
       (wrap
+       ;; Once we get the result from the inner part, we'll resume
+       ;; this continuation, but first
+       ;; @@: Is this running immediately, or queueing the result
+       ;;   after evaluation for the next agenda tick?  It looks
+       ;;   like evaluating immediately.  Is that what we want?
        (kont
-        (begin body ...)))
+        ;; Any unhandled errors are caught
+        (let ((exception-stack #f))
+          (catch #t
+            ;; Run the actual code the user requested
+            (lambda ()
+              body ...)
+            ;; If something bad happened and we didn't catch it,
+            ;; we'll wrap it up in such a way that the continuation
+            ;; can address it
+            ;; @@: For this stack to work doesn't it have to be
+            (lambda (key . args)
+              (make-wrapped-exception key args
+                                      exception-stack))
+            (lambda _
+              (set! exception-stack (make-stack #t 1 0)))))))
       when))))
 
 (define-syntax-rule (%run-delay body ... delay-time)
@@ -518,12 +536,6 @@ return the wrong thing via (%8sync) and trip themselves up."
        (lambda ()
          body ...)))))
 
-;; Aliases
-(define-syntax-rule (8run args ...) (%run args ...))
-(define-syntax-rule (8run-at args ...) (%run-at args ...))
-(define-syntax-rule (8run-delay args ...) (%run-delay args ...))
-(define-syntax-rule (8port-request args ...) (%port-request args ...))
-
 
 
 ;;; Execution of agenda, and current agenda