actors: Remove nesting of actions in define-simple-actor.

* 8sync/systems/actors.scm (define-simple-actor): Move actions out of
  the "final parenthesis".  Simple actors just have a class type and
  then the rest of the arguments are acitons.
* demos/actors/simplest-possible.scm: Remove unnecessary import
  of (ice-9 match).
  (<emo>, <proog>): Adjust to new syntax for define-simple-actor.

diff --git a/8sync/systems/actors.scm b/8sync/systems/actors.scm
index 87d29ec1b036b4fabae320b840a9866e86e5010d..ce55597bf912aa001282e65cbac055c872a7b991 100644 (file)
--- a/8sync/systems/actors.scm
+++ b/8sync/systems/actors.scm
@@ -349,7 +349,7 @@ more compact following syntax:
      (simple-dispatcher
       (list (%expand-action-item action-item) ...)))))
 
      (simple-dispatcher
       (list (%expand-action-item action-item) ...)))))
 

-(define-syntax-rule (define-simple-actor class (actions ...))
+(define-syntax-rule (define-simple-actor class actions ...)

   (define-class class (<actor>)
     (message-handler
      #:init-value (make-action-dispatch actions ...)
   (define-class class (<actor>)
     (message-handler
      #:init-value (make-action-dispatch actions ...)

diff --git a/demos/actors/simplest-possible.scm b/demos/actors/simplest-possible.scm
index 1cd00ea7a47b87fafead5efda7a4917179bf4a86..6c9715915323ec0cc9cbaad6f85832b8b7f0ae16 100644 (file)
--- a/demos/actors/simplest-possible.scm
+++ b/demos/actors/simplest-possible.scm
@@ -17,25 +17,25 @@
 ;;; License along with 8sync.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (8sync systems actors)
 ;;; License along with 8sync.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules (8sync systems actors)

-             (ice-9 match)

              (oop goops))
 
 (define-simple-actor <emo>
              (oop goops))
 
 (define-simple-actor <emo>

-  ((greet-proog
-    (lambda (actor message)
-      (display "Heya Proog!\n")
-      (send-message
-       actor (message-ref message 'target)
-       'greet-emo)))))
+  (greet-proog
+   (lambda (actor message)
+     (display "Heya Proog!\n")
+     (send-message
+      actor (message-ref message 'target)
+      'greet-emo))))

 
 (define-simple-actor <proog>
 
 (define-simple-actor <proog>

-  ((greet-emo
-    (lambda (actor message)
-      (display "Hi, Emo!\n")))))
+  (greet-emo
+   (lambda (actor message)
+     (display "Hi, Emo!\n"))))

 
 (define hive (make-hive))
 (define our-emo (hive-create-actor hive <emo>))
 (define our-proog (hive-create-actor hive <proog>))
 
 (define hive (make-hive))
 (define our-emo (hive-create-actor hive <emo>))
 (define our-proog (hive-create-actor hive <proog>))

-(ez-run-hive hive
-             (list (hive-bootstrap-message hive our-emo 'greet-proog
-                                           #:target our-proog)))
+(define (run-demo)
+  (ez-run-hive hive
+               (list (hive-bootstrap-message hive our-emo 'greet-proog
+                                             #:target our-proog))))