actors: Reflect removal of choice of whether to cleanup in self-destruct

[8sync.git] / demos / ircbot.scm

diff --git a/demos/ircbot.scm b/demos/ircbot.scm
index 1c4ae748e0704192a2a4bb0e02be8e111c0d2dc6..81940fc66744e86206e9449922d1fb6dba44f3ec 100755 (executable)
--- a/demos/ircbot.scm
+++ b/demos/ircbot.scm
@@ -3,7 +3,7 @@
 !#
 
 ;;; 8sync --- Asynchronous programming for Guile
-;;; Copyright (C) 2015 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2015, 2016, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;;
 ;;; This file is part of 8sync.
 ;;;
@@ -26,12 +26,13 @@
              (oop goops)
              (srfi srfi-37)
              (ice-9 format)
-             (ice-9 match))
+             (ice-9 match)
+             (fibers conditions))
 
 (define-class <my-irc-bot> (<irc-bot>))
 
-(define-method (handle-line (irc-bot <my-irc-bot>) speaker channel
-                            line emote?)
+(define-method (handle-line (irc-bot <my-irc-bot>) message
+                            speaker channel line emote?)
   (define my-name (irc-bot-username irc-bot))
   (define (looks-like-me? str)
     (or (equal? str my-name)
@@ -102,28 +103,22 @@
                   (server "irc.freenode.net")
                   (channels '("##botchat"))
                   (repl #f))
-  (define hive (make-hive))
-  (define irc-bot
-    (hive-create-actor* hive <my-irc-bot> "irc-bot"
-                        #:username username
-                        #:server server
-                        #:channels channels))
-  (define repl-manager
-    (cond
-     ((string? repl)
-      (hive-create-actor* hive <repl-manager> "repl"
-                          #:path repl))
-     (repl
-      (hive-create-actor* hive <repl-manager> "repl"))))
+  (run-hive
+   (lambda (hive)
+     (define irc-bot
+       (create-actor* <my-irc-bot> "irc-bot"
+                      #:username username
+                      #:server server
+                      #:channels channels))
+     (define repl-manager
+       (cond
+        ((string? repl)
+         (create-actor* <repl-manager> "repl"
+                        #:path repl))
+        (repl
+         (create-actor* <repl-manager> "repl"))))
 
-  (define initial-messages
-    (if repl
-        (list (bootstrap-message hive irc-bot 'init)
-              (bootstrap-message hive repl-manager 'init))
-        (list (bootstrap-message hive irc-bot 'init))))
-
-  ;; TODO: load REPL
-  (run-hive hive initial-messages))
+     (wait (make-condition)))))
 
 (define (main args)
   (define parsed-args (parse-args "ircbot.scm" args))