agenda: Rename %8sync (and %8sync-*) to 8sync (and 8sync-*)

* 8sync/agenda.scm (%8sync, %8sync-delay, %8sync-run, %8sync-run-at)
  (%8sync-run-delay, %8sync-port, %8sync-port-remove, catch-%8sync):
  Rename, removing % sign.  Rename all references to other %8sync-foo
  in definitions and comments as well.
  (catch-8sync): Removed aliased version.
  (make-async-request, setup-async-request): Rename references of
  %8sync-foo to 8sync-foo.

* 8sync/systems/irc.scm (make-basic-irc-handler):
* 8sync/systems/web.scm (receive-http-conn):
* tests/test-agenda.scm: Rename all %8sync-foo to 8sync-foo.

diff --git a/8sync/agenda.scm b/8sync/agenda.scm
index af5ef3ce31b516bbeb2d9df05404926e9d0fa336..db8180b0e0dede289f147f903f4de3b9d0844f1a 100644 (file)
--- a/8sync/agenda.scm
+++ b/8sync/agenda.scm
@@ -68,11 +68,11 @@
 
             run-it wrap wrap-apply run run-at run-delay
 
-            %8sync %8sync-delay
-            %8sync-run %8sync-run-at %8sync-run-delay
-            %8sync-port %8sync-port-remove
+            8sync 8sync-delay
+            8sync-run 8sync-run-at 8sync-run-delay
+            8sync-port 8sync-port-remove
             
-            catch-8sync catch-%8sync
+            catch-8sync
 
             ;; used for introspecting the error, but a method for making
             ;; is not exposed
@@ -471,7 +471,7 @@ Will produce (0 . 0) instead of a negative number, if needed."
 ;;; Asynchronous escape to run things
 ;;; =================================
 
-(define-syntax-rule (%8sync-abort-to-prompt async-request)
+(define-syntax-rule (8sync-abort-to-prompt async-request)
   (abort-to-prompt (current-agenda-prompt)
                    async-request))
 
@@ -480,7 +480,7 @@ Will produce (0 . 0) instead of a negative number, if needed."
   "Wrap PROC in an async-request
 
 The purpose of this is to make sure that users don't accidentally
-return the wrong thing via (%8sync) and trip themselves up."
+return the wrong thing via (8sync) and trip themselves up."
   (cons '*async-request* proc))
 
 (define (setup-async-request resume-kont async-request)
@@ -491,7 +491,7 @@ return the wrong thing via (%8sync) and trip themselves up."
     ;; TODO: deliver more helpful errors depending on what the user
     ;;   returned
     (_ (throw 'invalid-async-request
-              "Invalid request passed back via an (%8sync) procedure."
+              "Invalid request passed back via an (8sync) procedure."
               async-request))))
 
 (define-record-type <wrapped-exception>
@@ -510,22 +510,22 @@ return the wrong thing via (%8sync) and trip themselves up."
                (wrapped-exception-stacks body-result))
         body-result)))
 
-(define-syntax %8sync
+(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))))
+    ((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 body ...)
+  (8sync-run-at body ... #f))
 
-(define-syntax-rule (%8sync-run-at body ... when)
+(define-syntax-rule (8sync-run-at body ... when)
   (propagate-%async-exceptions
-   (%8sync-abort-to-prompt
+   (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
@@ -564,14 +564,14 @@ Possibly specify WHEN as the second argument."
                 (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-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-delay args ...)
+  (8sync-run-delay args ...))
 
-(define-syntax-rule (%8sync-port port port-request-args ...)
-  (%8sync-abort-to-prompt
+(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 ...)
@@ -581,26 +581,26 @@ Possibly specify WHEN as the second argument."
              ;; "Zero values returned to single-valued continuation""
              (wrap (kont #f)) #f))))))
 
-(define-syntax-rule (%8sync-port-remove port)
-  (%8sync-abort-to-prompt
+(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
+             ;; See comment in 8sync-port
              (wrap (kont #f)) #f))))))
 
 
 ;; TODO: Write (%run-immediately)
 
-(define-syntax-rule (%8sync-immediate body)
+(define-syntax-rule (8sync-immediate body)
   "Run body asynchronously but ignore its result...
 forge ahead in our current function!"
-  (%8sync-abort-to-prompt
+  (8sync-abort-to-prompt
    (make-async-request
     (lambda (kont)
       (list (make-run-request
-             ;; See comment in %8sync-port
+             ;; See comment in 8sync-port
              (wrap (kont #f)) #f)
             (make-run-request body #f))))))
 
@@ -616,10 +616,6 @@ forge ahead in our current function!"
        (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

diff --git a/8sync/systems/irc.scm b/8sync/systems/irc.scm
index f8e01b43c02a0f94309538a368be54cb6b966a8f..c2fe8e34f74403d48ca11b26d4655f1dd13db449 100755 (executable)
--- a/8sync/systems/irc.scm
+++ b/8sync/systems/irc.scm
@@ -241,7 +241,7 @@
              ;; reset buffer
              (set! buffer '())
              ;; run it
-             (%8sync (handle-line
+             (8sync (handle-line
                       socket
                       ready-line
                       username))))

diff --git a/8sync/systems/web.scm b/8sync/systems/web.scm
index 602e06f827f08ce835cf02ed8eb50678a4e07fbc..76c38dfb0f3835945ffdbc91b281fbb97d73d124 100644 (file)
--- a/8sync/systems/web.scm
+++ b/8sync/systems/web.scm
@@ -92,7 +92,7 @@ don't totally failboat"
         ((client-conn . socket-address)
          (define (close-and-dequeue)
            (close client-conn)
-           (%8sync-port-remove client-conn))
+           (8sync-port-remove client-conn))
 
          (catch
            #t
@@ -103,7 +103,7 @@ don't totally failboat"
                    (lambda ()
                      (call-with-values
                          (lambda ()
-                           ;; @@: Is it useful to wrap this in %8sync-run?
+                           ;; @@: Is it useful to wrap this in 8sync-run?
                            ;;  It's more indirection but might give breathing
                            ;;  room to other requests...
                            (handler request request-body))

diff --git a/tests/test-agenda.scm b/tests/test-agenda.scm
index 12826c29b02efad4b40a4a891ec874ba71f4c8e8..5edc0cdb32a8fd9ee5e8024ff5b8aa0d3810c743 100644 (file)
--- a/tests/test-agenda.scm
+++ b/tests/test-agenda.scm
@@ -258,7 +258,7 @@
   (test-equal (run-request-when run-two-squared) '(88 . 0)))
 
 
-;;; %run, %8sync and friends tests
+;;; %run, 8sync and friends tests
 ;;; ==============================
 
 (define-syntax-rule (run-in-fake-agenda
@@ -289,23 +289,23 @@
                    '("applesauce"))))))
 
 (test-%run-and-friends (run-in-fake-agenda
-                        (%8sync (string-concatenate '("apple" "sauce"))))
+                        (8sync (string-concatenate '("apple" "sauce"))))
                        #f)
 
 (test-%run-and-friends (run-in-fake-agenda
-                        (%8sync (string-concatenate '("apple" "sauce"))
+                        (8sync (string-concatenate '("apple" "sauce"))
                                 '(8 . 0)))
                        '(8 . 0))
 
 (test-%run-and-friends (run-in-fake-agenda
-                        (%8sync-delay (string-concatenate '("apple" "sauce"))
+                        (8sync-delay (string-concatenate '("apple" "sauce"))
                                       8))
                        ;; whoa, I'm surprised equal? can
                        ;; compare records like this
                        (tdelta 8))
 
 ;; TODO: test %port-request
-;; TODO: test %8sync and friends!
+;; TODO: test 8sync and friends!
 
 
 ;;; Agenda tests
@@ -356,7 +356,7 @@
   (speaker "Today I went to the zoo and I saw...\n")
   (speaker
    (string-concatenate
-    `("A " ,(symbol->string (%8sync (return-monkey))) "!\n"))))
+    `("A " ,(symbol->string (8sync (return-monkey))) "!\n"))))
 
 (begin
   (set! speaker (speak-it))
@@ -379,14 +379,14 @@
 
 (define (indirection-remote-func-breaks)
   (speaker "bebop\n")
-  (%8sync (remote-func-breaks))
+  (8sync (remote-func-breaks))
   (speaker "bidop\n"))
 
 (define* (local-func-gets-break #:key with-indirection)
   (speaker "Time for exception fun!\n")
   (let ((caught-exception #f))
     (catch-8sync
-     (%8sync-run (if with-indirection
+     (8sync-run (if with-indirection
                          (indirection-remote-func-breaks)
                          (remote-func-breaks)))
       ('numerical-overflow