actors: Implicit from-actor argument <-foo methods, and add rest of <-foo*.

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

diff --git a/demos/ircbot.scm b/demos/ircbot.scm
index ec381f0b83ea3b03b356fdc9e3b6eaed85a270a6..1c4ae748e0704192a2a4bb0e02be8e111c0d2dc6 100755 (executable)
--- a/demos/ircbot.scm
+++ b/demos/ircbot.scm
@@ -22,10 +22,16 @@
 
 (use-modules (8sync)
              (8sync systems irc)
+             (8sync repl)
+             (oop goops)
              (srfi srfi-37)
+             (ice-9 format)
              (ice-9 match))
 
-(define (handle-line irc-bot speaker channel line emote?)
+(define-class <my-irc-bot> (<irc-bot>))
+
+(define-method (handle-line (irc-bot <my-irc-bot>) speaker channel
+                            line emote?)
   (define my-name (irc-bot-username irc-bot))
   (define (looks-like-me? str)
     (or (equal? str my-name)
@@ -35,19 +41,19 @@
      (match action
        ;; The classic botsnack!
        ("botsnack"
-        (<- irc-bot (actor-id irc-bot) 'send-line channel
+        (<- (actor-id irc-bot) 'send-line channel
             "Yippie! *does a dance!*"))
        ;; Return greeting
        ((or "hello" "hello!" "hello." "greetings" "greetings." "greetings!"
             "hei" "hei." "hei!" "hi" "hi!")
-        (<- irc-bot (actor-id irc-bot) 'send-line channel
+        (<- (actor-id irc-bot) 'send-line channel
             (format #f "Oh hi ~a!" speaker)))
 
        ;; --->  Add yours here <---
 
        ;; Default
        (_
-        (<- irc-bot (actor-id irc-bot) 'send-line channel
+        (<- (actor-id irc-bot) 'send-line channel
             "*stupid puppy look*"))))
     ;; Otherwise... just spit the output to current-output-port or whatever
     (_
@@ -81,7 +87,10 @@
                    (option '("channels") #t #f
                            (lambda (opt name arg result)
                              `(#:channels ,(string-split arg #\,)
-                               ,@result))))
+                               ,@result)))
+                   (option '("repl") #f #t
+                           (lambda (opt name arg result)
+                             `(#:repl ,(or arg #t) ,@result))))
              (lambda (opt name arg result)
                (format #t "Unrecognized option `~a'\n" name)
                (exit 1))
@@ -95,17 +104,29 @@
                   (repl #f))
   (define hive (make-hive))
   (define irc-bot
-    (hive-create-actor* hive <irc-bot> "irc-bot"
-                        #:line-handler handle-line
-                        ;; TODO: move these to argument parsing
+    (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"))))
+
+  (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
-  (ez-run-hive hive (list (bootstrap-message hive irc-bot 'init))))
+  (run-hive hive initial-messages))
 
 (define (main args)
-  (define parsed-args (parse-args "ircbot.scm" (pk 'args args)))
+  (define parsed-args (parse-args "ircbot.scm" args))
   (apply (lambda* (#:key username #:allow-other-keys)
            (when (not username)
              (display "Error: username not specified!")