Update all deprecated/discouraged Guile calls
[clinton/bobotpp.git] / source / Interp.C
index 27ad0fb..9f1b805 100644 (file)
@@ -1,6 +1,6 @@
 // Interp.C  -*- C++ -*-
 // Copyright (c) 1998 Etienne BERNARD
-// Copyright (C) 2002 Clinton Ebadi
+// Copyright (C) 2002,2005,2008 Clinton Ebadi
 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #include "Commands.H"
 #include "Interp.H"
 #include "BotInterp.H"
+#include "ShitEntry.H"
 
 #include <libguile.h>
 
@@ -116,62 +117,71 @@ interp_init_helper (void* unused)
 {
   scm_c_use_module ("guile-user");
   // Hooks
-  scm_c_define ("bot:exit-hook", scm_make_hook (scm_long2num (0)));
+  scm_c_define ("bot:exit-hook", scm_make_hook (scm_from_int (0)));
 
   // Symbols
   // bot:user-*
-  scm_c_define ("bot:user-none", scm_long2num (User::NONE));
-  scm_c_define ("bot:user-user", scm_long2num (User::USER));
-  scm_c_define ("bot:user-trusted", scm_long2num (User::TRUSTED_USER));
-  scm_c_define ("bot:user-friend", scm_long2num (User::FRIEND));
-  scm_c_define ("bot:user-master", scm_long2num (User::MASTER));
+  scm_c_define ("bot:user-none", scm_from_int (User::NONE));
+  scm_c_define ("bot:user-user", scm_from_int (User::USER));
+  scm_c_define ("bot:user-trusted", scm_from_int (User::TRUSTED_USER));
+  scm_c_define ("bot:user-friend", scm_from_int (User::FRIEND));
+  scm_c_define ("bot:user-master", scm_from_int (User::MASTER));
 
   // protection
-  scm_c_define ("bot:protection/none", scm_long2num (User::NO_PROT));
-  scm_c_define ("bot:protection/no-ban", scm_long2num (User::NO_BAN));
-  scm_c_define ("bot:protection/no-kick", scm_long2num (User::NO_KICK));
-  scm_c_define ("bot:protection/no-deop", scm_long2num (User::NO_DEOP));
+  scm_c_define ("bot:protection/none", scm_from_int (User::NO_PROT));
+  scm_c_define ("bot:protection/no-ban", scm_from_int (User::NO_BAN));
+  scm_c_define ("bot:protection/no-kick", scm_from_int (User::NO_KICK));
+  scm_c_define ("bot:protection/no-deop", scm_from_int (User::NO_DEOP));
 
   // auto-op
-  scm_c_define ("bot:aop/yes", scm_long2num (true));
-  scm_c_define ("bot:aop/no", scm_long2num (false));
+  scm_c_define ("bot:aop/yes", scm_from_int (true));
+  scm_c_define ("bot:aop/no", scm_from_int (false));
+
+  // shit-list
+  scm_c_define ("bot:shit/none", scm_from_int (ShitEntry::SHIT_NOSHIT));
+  scm_c_define ("bot:shit/no-op", scm_from_int (ShitEntry::SHIT_NOOP));
+  scm_c_define ("bot:shit/no-join", scm_from_int (ShitEntry::SHIT_NOJOIN));
+  scm_c_define ("bot:shit/no-deban", 
+               scm_from_int (ShitEntry::SHIT_NODEBAN));
   
   // sys-dir
   scm_c_define ("bot:sys-scripts-dir", 
-               scm_makfrom0str (String(PREFIX) + 
-                                "/share/bobotpp/scripts/"));
+               scm_from_locale_string (String(PREFIX) + 
+                                      "/share/bobotpp/scripts/"));
   // Hooks
-  scm_c_define ("hooks/action", scm_long2num(Hook::ACTION));
-  scm_c_define ("hooks/nickname", scm_long2num(Hook::NICKNAME));
-  scm_c_define ("hooks/signoff", scm_long2num(Hook::SIGNOFF));
-  scm_c_define ("hooks/ctcp", scm_long2num(Hook::CTCP));
-  scm_c_define ("hooks/ctcp-reply", scm_long2num(Hook::CTCP_REPLY));
-  scm_c_define ("hooks/disconnect", scm_long2num(Hook::DISCONNECT));
-  scm_c_define ("hooks/flood", scm_long2num(Hook::FLOOD));
-  scm_c_define ("hooks/invite", scm_long2num(Hook::INVITE));
-  scm_c_define ("hooks/join", scm_long2num(Hook::JOIN));
-  scm_c_define ("hooks/kick", scm_long2num(Hook::KICK));
-  scm_c_define ("hooks/mode", scm_long2num(Hook::MODE));
-  scm_c_define ("hooks/message", scm_long2num(Hook::MESSAGE));
-  scm_c_define ("hooks/notice", scm_long2num(Hook::NOTICE));
-  scm_c_define ("hooks/part", scm_long2num(Hook::PART));
-  scm_c_define ("hooks/public", scm_long2num(Hook::PUBLIC));
-  scm_c_define ("hooks/public-notice", scm_long2num(Hook::PUBLIC_NOTICE));
-  scm_c_define ("hooks/raw", scm_long2num(Hook::RAW));
-  scm_c_define ("hooks/timer", scm_long2num(Hook::TIMER));
-  scm_c_define ("hooks/topic", scm_long2num(Hook::TOPIC));
+  scm_c_define ("hooks/action", scm_from_int(Hook::ACTION));
+  scm_c_define ("hooks/nickname", scm_from_int(Hook::NICKNAME));
+  scm_c_define ("hooks/signoff", scm_from_int(Hook::SIGNOFF));
+  scm_c_define ("hooks/ctcp", scm_from_int(Hook::CTCP));
+  scm_c_define ("hooks/ctcp-reply", scm_from_int(Hook::CTCP_REPLY));
+  scm_c_define ("hooks/disconnect", scm_from_int(Hook::DISCONNECT));
+  scm_c_define ("hooks/flood", scm_from_int(Hook::FLOOD));
+  scm_c_define ("hooks/invite", scm_from_int(Hook::INVITE));
+  scm_c_define ("hooks/join", scm_from_int(Hook::JOIN));
+  scm_c_define ("hooks/kick", scm_from_int(Hook::KICK));
+  scm_c_define ("hooks/mode", scm_from_int(Hook::MODE));
+  scm_c_define ("hooks/message", scm_from_int(Hook::MESSAGE));
+  scm_c_define ("hooks/notice", scm_from_int(Hook::NOTICE));
+  scm_c_define ("hooks/part", scm_from_int(Hook::PART));
+  scm_c_define ("hooks/public", scm_from_int(Hook::PUBLIC));
+  scm_c_define ("hooks/public-notice", scm_from_int(Hook::PUBLIC_NOTICE));
+  scm_c_define ("hooks/raw", scm_from_int(Hook::RAW));
+  scm_c_define ("hooks/timer", scm_from_int(Hook::TIMER));
+  scm_c_define ("hooks/topic", scm_from_int(Hook::TOPIC));
   // send hooks
-  scm_c_define ("hooks/send/public", scm_long2num (Hook::SEND_PUBLIC));
-  scm_c_define ("hooks/send/message", scm_long2num (Hook::SEND_MESSAGE));
-  scm_c_define ("hooks/send/action", scm_long2num (Hook::SEND_ACTION));
-  scm_c_define ("hooks/send/ctcp", scm_long2num (Hook::SEND_CTCP));
+  scm_c_define ("hooks/send/public", scm_from_int (Hook::SEND_PUBLIC));
+  scm_c_define ("hooks/send/message", scm_from_int (Hook::SEND_MESSAGE));
+  scm_c_define ("hooks/send/action", scm_from_int (Hook::SEND_ACTION));
+  scm_c_define ("hooks/send/ctcp", scm_from_int (Hook::SEND_CTCP));
+  scm_c_define ("hooks/send/who", scm_from_int (Hook::SEND_WHO));
+  scm_c_define ("hooks/send/whois", scm_from_int (Hook::SEND_WHOIS));
   // dcc hooks
   scm_c_define ("hooks/dcc/chat-begin", 
-               scm_long2num (Hook::DCC_CHAT_BEGIN));
+               scm_from_int (Hook::DCC_CHAT_BEGIN));
   scm_c_define ("hooks/dcc/chat-end",
-               scm_long2num (Hook::DCC_CHAT_END));
+               scm_from_int (Hook::DCC_CHAT_END));
   scm_c_define ("hooks/dcc/chat-message", 
-               scm_long2num (Hook::DCC_CHAT_MESSAGE));
+               scm_from_int (Hook::DCC_CHAT_MESSAGE));
 
   // procedures
   bot_new_procedure ("bot:action", (SCMFunc)ScriptCommands::Action, 2, 0, 0);
@@ -185,6 +195,10 @@ interp_init_helper (void* unused)
   bot_new_procedure ("bot:change-command-level", 
                     (SCMFunc)ScriptCommands::ChangeCommandLevel,
                     2, 0, 0);
+  scm_c_define_gsubr ("bot:ctcp", 3, 0, 0,
+                     (SCMFunc)ScriptCommands::CTCP);
+  scm_c_define_gsubr ("bot:ctcp-reply", 3, 0, 0,
+                     (SCMFunc)ScriptCommands::CTCPReply);
   bot_new_procedure ("bot:cycle", (SCMFunc)ScriptCommands::Action, 1, 0, 0);
   bot_new_procedure ("bot:deban", (SCMFunc)ScriptCommands::Deban, 2, 0, 0);
   bot_new_procedure ("bot:delserver", (SCMFunc)ScriptCommands::DelServer, 
@@ -208,7 +222,7 @@ interp_init_helper (void* unused)
   bot_new_procedure ("bot:nick", (SCMFunc)ScriptCommands::Nick, 1, 0, 0);
 
   scm_c_define_gsubr ("bot:notice", 2, 0, 0, 
-                     (SCMFunc)ScriptCommands::sendNotice);
+                     (SCMFunc)ScriptCommands::Notice);
 
   bot_new_procedure ("bot:op", (SCMFunc)ScriptCommands::Op, 2, 0, 0);
   bot_new_procedure ("bot:part", (SCMFunc)ScriptCommands::Part, 1, 0, 0);
@@ -224,6 +238,8 @@ interp_init_helper (void* unused)
   bot_new_procedure ("bot:tkban", (SCMFunc)ScriptCommands::TKBan, 3, 1, 0);
   bot_new_procedure ("bot:topic", (SCMFunc)ScriptCommands::Topic, 2, 0, 0);
   bot_new_procedure ("bot:unlock", (SCMFunc)ScriptCommands::Unlock, 1, 0, 0);
+  scm_c_define_gsubr ("bot:who", 1, 0, 0, (SCMFunc)ScriptCommands::Who);
+  scm_c_define_gsubr ("bot:whois", 1, 0, 0, (SCMFunc)ScriptCommands::Whois);
 
   bot_new_procedure ("bot:getnickname", (SCMFunc)ScriptCommands::getNickname, 
                     0, 0, 0);
@@ -250,12 +266,6 @@ interp_init_helper (void* unused)
 
   scm_c_define_gsubr ("bot:dcc-chat-send", 2, 0, 0,
                      (SCMFunc)ScriptCommands::sendDCCChatMessage);
-
-  // "Low Level" Message functuions
-  scm_c_define_gsubr ("bot:send-ctcp", 3, 0, 0,
-                     (SCMFunc)ScriptCommands::sendCTCP);
-  scm_c_define_gsubr ("bot:send-ctcp-reply", 3, 0, 0,
-                     (SCMFunc)ScriptCommands::sendCTCPReply);
 }
 
 #undef bot_new_procedure
@@ -272,8 +282,8 @@ interp_post_startup_helper (void *bot_module)
 
   // load bobot-utils
   scm_primitive_load 
-    (scm_makfrom0str (String(PREFIX) + 
-                     "/share/bobotpp/scripts/bobot-utils.scm"));
+    (scm_from_locale_string (String(PREFIX) + 
+                            "/share/bobotpp/scripts/bobot-utils.scm"));
   return SCM_UNSPECIFIED;
 }
 
@@ -283,6 +293,12 @@ Interp::Startup()
   bot_module = scm_c_define_module ("the-bot-module", 
                                    interp_init_helper, 0);
 
+}
+
+void Interp::Startup2 (Bot *b)
+{
+  bot = b;
+
   scm_c_call_with_current_module (bot_module,
                                  interp_post_startup_helper,
                                  bot_module);
@@ -291,7 +307,9 @@ Interp::Startup()
 void
 Interp::Shutdown()
 { 
-  scm_c_run_hook (gh_lookup ("bot:exit-hook"), SCM_EOL);
+  scm_c_run_hook (scm_variable_ref (scm_c_module_lookup (bot_module, 
+                                                        "bot:exit-hook")), 
+                 SCM_EOL);
 }
 
 void