X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=eightsync%2Fagenda.scm;h=15220d7494f0f5ec107d778e0a43754d2853a761;hb=3bac50d482cbfb9dc6cbc925dd19503c84e44d75;hp=77bd63b5ccc0f6ec9f598a8edb2bcbfb22a8edf8;hpb=568b5594aed6a98b0777fe7289547094ae9d0b2b;p=8sync.git diff --git a/eightsync/agenda.scm b/eightsync/agenda.scm index 77bd63b..15220d7 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,36 +434,12 @@ Will produce (0 . 0) instead of a negative number, if needed." ;;; Asynchronous escape to run things ;;; ================================= -;; The future's in futures -;; @@: ... kinda conflicts with ice-9 futures. Should we rename -;; to "futurists"? :) - -(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. @@ -520,12 +495,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