irc: Shorten generic method names.

* 8sync/systems/irc.scm: (handle-line, handle-misc-input)
(handle-user-join, handle-user-quit): Shorten names from their previous
irc-bot-* longer names.  Update callers.
* demos/ircbot.scm: Update callers to above.

diff --git a/8sync/systems/irc.scm b/8sync/systems/irc.scm
index 01a83c8f6535526c6d0f625a73dfc5f625d7cfcc..536c9a26ce38ff3e2002fa6b7e15f18db375625f 100755 (executable)
--- a/8sync/systems/irc.scm
+++ b/8sync/systems/irc.scm
@@ -35,8 +35,8 @@
   #:export (<irc-bot>
             irc-bot-username irc-bot-server irc-bot-channels irc-bot-port
 
-            irc-bot-handle-line irc-bot-handle-misc-input
-            irc-bot-handle-user-join irc-bot-handle-user-quit
+            handle-line handle-misc-input
+            handle-user-join handle-user-quit
 
             default-irc-port))
 
@@ -192,7 +192,7 @@
 (define (irc-bot-main-loop irc-bot message)
   (define socket (irc-bot-socket irc-bot))
   (define line (string-trim-right (read-line socket) #\return))
-  (irc-bot-dispatch-raw-line irc-bot line)
+  (dispatch-raw-line irc-bot line)
   (cond
    ;; The port's been closed for some reason, so stop looping
    ((port-closed? socket)
@@ -220,7 +220,7 @@
 
 ;;; Likely-to-be-overridden generic methods
 
-(define-method (irc-bot-dispatch-raw-line (irc-bot <irc-bot>) raw-line)
+(define-method (dispatch-raw-line (irc-bot <irc-bot>) raw-line)
   "Dispatch a raw line of input"
   (receive (line-prefix line-command line-params)
       (parse-line raw-line)
@@ -235,17 +235,17 @@
                                 line-text emote?))))
       (_ (irc-bot-handle-misc-input irc-bot raw-line)))))
 
-(define-method (irc-bot-handle-line (irc-bot <irc-bot>) username channel-name
+(define-method (handle-line (irc-bot <irc-bot>) username channel-name
                                     line-text emote?)
   (echo-message irc-bot username channel-name line-text emote?))
 
-(define-method (irc-bot-handle-misc-input (irc-bot <irc-bot>) raw-line)
+(define-method (handle-misc-input (irc-bot <irc-bot>) raw-line)
   (display raw-line)
   (newline))
 
-(define-method (irc-bot-handle-user-join (irc-bot <irc-bot>) user channel)
+(define-method (handle-user-join (irc-bot <irc-bot>) user channel)
   'TODO)
 
-(define-method (irc-bot-handle-user-quit (irc-bot <irc-bot>) user channel)
+(define-method (handle-user-quit (irc-bot <irc-bot>) user channel)
   'TODO)
 

diff --git a/demos/ircbot.scm b/demos/ircbot.scm
index bfcd723fca8f9722b014192c75d48e366dd35748..48fc6b7ac7a6ba5d76d08ca4dd8e7f51b80bb271 100755 (executable)
--- a/demos/ircbot.scm
+++ b/demos/ircbot.scm
@@ -28,8 +28,8 @@
 
 (define-class <my-irc-bot> (<irc-bot>))
 
-(define-method (irc-bot-handle-line (irc-bot <my-irc-bot>) speaker channel
-                                    line emote?)
+(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)