From a7bc314242cab78532f2a6b18ceb5863cfc863ef Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 24 Nov 2015 12:38:06 -0600 Subject: [PATCH] rename %sync stuff to %8sync (thanks for the suggestion, daviid) --- eightsync/agenda.scm | 22 +++++----------------- eightsync/systems/irc.scm | 2 +- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/eightsync/agenda.scm b/eightsync/agenda.scm index 1bfc0a3..13cb95d 100644 --- a/eightsync/agenda.scm +++ b/eightsync/agenda.scm @@ -50,7 +50,7 @@ schedule-segments-split schedule-extract-until! add-segments-contents-to-queue! - %sync 8sync + %8sync make-run-request run-request? @@ -456,31 +456,19 @@ Will produce (0 . 0) instead of a negative number, if needed." (make-future call-first on-success on-fail on-error) when)) -(define-syntax-rule (%sync async-request) +(define-syntax-rule (%8sync async-request) "Run BODY asynchronously at a prompt, passing args to make-future. -Pronounced `eight-sync' despite the spelling. - -%sync was chosen because (async) was already taken and could lead to -errors, and this version of asynchronous code uses a prompt, so the `a' -character becomes a `%' prompt! :) - -The % and 8 characters kind of look similar... hence this library's -name! (That, and the pun 'eight-synchronous' programming.) -There are 8sync aliases if you prefer that name." +Runs things asynchronously (8synchronously?)" (abort-to-prompt (current-agenda-prompt) async-request)) -(define-syntax-rule (8sync args ...) - "Alias for %sync" - (%sync args ...)) - ;; Async port request and run-request meta-requests (define (make-async-request proc) "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 +479,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 (%sync) procedure." + "Invalid request passed back via an (%8sync) procedure." async-request)))) (define-syntax-rule (%run body ...) diff --git a/eightsync/systems/irc.scm b/eightsync/systems/irc.scm index ac9c4e6..e45db1a 100755 --- a/eightsync/systems/irc.scm +++ b/eightsync/systems/irc.scm @@ -226,7 +226,7 @@ (set! buffer (cons (read-char socket) buffer)) (match buffer ((#\newline #\return (? char? line-chars) ...) - (%sync (%run (handle-line + (%8sync (%run (handle-line socket (list->string (reverse line-chars)) username))) -- 2.31.1