-(define (simple-dispatcher action-map)
- (lambda (actor message)
- (let* ((action (message-action message))
- (method (assoc-ref action-map action)))
- (if (not method)
- ;; @@: There's every possibility this should be handled in
- ;; hive-process-message instead.
- (throw 'action-not-found
- "No appropriate action handler found for actor"
- #:action action
- #:actor actor
- #:message message
- #:available-actions (map car action-map)))
- (apply method actor message (message-body message)))))
-
-(define-syntax %expand-action-item
- (syntax-rules ()
- ((_ (action-name handler))
- (cons (quote action-name) handler))))
-
-(define-syntax-rule (build-actions action-item ...)
- "Build a mapping of actions. Same syntax as make-action-dispatch
-but this doesn't build the dispatcher for you (you probably want to
-pass it to simple-dispatcher).
-
-The advantage here is that since this simply builds an alist, you can
-compose it with other action maps."
- (list (%expand-action-item action-item) ...))
-
-(define-syntax make-action-dispatch
- (syntax-rules ()
- "Expand a list of action names and actions into an alist
-
-You can use this like the following:
- (make-action-dispatch
- (cookies
- (lambda (actor message)
- (display \"I love cookies!\n\")))
- (party
- (lambda (actor message)
- (display \"Life of the party!\"))))
-
-Alternately, if you'd like to skip the lambda, you could use the slightly
-more compact following syntax:
- (make-action-dispatch
- ((cookies actor message)
- (display \"I love cookies!\n\"))
- ((party actor message)
- (display \"Life of the party!\")))"
- ((make-action-dispatch action-item ...)
- (simple-dispatcher (build-actions action-item ...)))))
-
-(define-syntax-rule (define-simple-actor class actions ...)
+(define-syntax-rule (build-actions (symbol method) ...)
+ "Construct an alist of (symbol . method), where the method is wrapped
+with wrap-apply to facilitate live hacking and allow the method definition
+to come after class definition."
+ (list
+ (cons (quote symbol)
+ (wrap-apply method)) ...))
+
+(define-syntax-rule (define-simple-actor class action ...)