-(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
- ;; 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
- (lambda (key . args)
- (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))))
-
-(define-syntax-rule (%run-delay body ... delay-time)
- (%run-at body ... (tdelta delay-time)))
-
-(define-syntax-rule (%port-request port port-request-args ...)
- (make-async-request
- (lambda (kont)
- (list (make-port-request port port-request-args ...)
- (make-run-request kont)))))
-
-(define-syntax-rule (%port-remove-request port)
- (make-async-request
- (lambda (kont)
- (list (make-port-remove-request port)
- (make-run-request kont)))))
-
-
-;; Sugar
-(define-syntax-rule (%8sync-run rest ...)
- "Sugar for (%8sync (%run ...))"
- (%8sync (%run rest ...)))
-
-(define-syntax-rule (%8sync-run-at rest ...)
- "Sugar for (%8sync (%run-at ...))"
- (%8sync (%run-at rest ...)))
-
-(define-syntax-rule (%8sync-run-delay rest ...)
- "Sugar for (%8sync (%run-delay ...))"
- (%8sync (%run-delay rest ...)))
-
-(define-syntax-rule (%8sync-port rest ...)
- "Sugar for (%8sync (%port-request ...))"
- (%8sync (%port-request rest ...)))
+(define-syntax 8sync
+ (syntax-rules ()
+ "Run BODY asynchronously (8synchronously?) at a prompt, then return.
+
+Possibly specify WHEN as the second argument."
+ ((8sync body)
+ (8sync-run body))
+ ((8sync body when)
+ (8sync-run-at body when))))
+
+(define-syntax-rule (8sync-run body ...)
+ (8sync-run-at body ... #f))
+
+(define-syntax-rule (8sync-run-at body ... when)
+ (propagate-%async-exceptions
+ (8sync-abort-to-prompt
+ ;; 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
+ ;; 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
+ (lambda (key . args)
+ (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))))))
+
+(define-syntax-rule (8sync-run-delay body ... delay-time)
+ (8sync-run-at body ... (tdelta delay-time)))
+
+(define-syntax-rule (8sync-delay args ...)
+ (8sync-run-delay args ...))
+
+(define-syntax-rule (8sync-port port port-request-args ...)
+ (8sync-abort-to-prompt
+ (make-async-request
+ (lambda (kont)
+ (list (make-port-request port port-request-args ...)
+ (make-run-request
+ ;; What's with returning #f to kont?
+ ;; Otherwise we sometimes get errors like
+ ;; "Zero values returned to single-valued continuation""
+ (wrap (kont #f)) #f))))))
+
+(define-syntax-rule (8sync-port-remove port)
+ (8sync-abort-to-prompt
+ (make-async-request
+ (lambda (kont)
+ (list (make-port-remove-request port)
+ (make-run-request
+ ;; See comment in 8sync-port
+ (wrap (kont #f)) #f))))))