// Interp.C -*- C++ -*-
// Copyright (c) 1998 Etienne BERNARD
-// Copyright (C) 2002,2005 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
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
// 02110-1301, USA.
+#include "Interp.H"
+
+#ifdef USESCRIPTS
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#ifdef USESCRIPTS
+#include <libguile.h>
+extern "C" {
+#include <libguile/hooks.h>
+}
-#include "Macros.H"
-#include "Commands.H"
-#include "Interp.H"
+#include "Bot.H"
#include "BotInterp.H"
+#include "Commands.H"
+#include "Macros.H"
+#include "ScriptCommands.H"
#include "ShitEntry.H"
-
-#include <libguile.h>
+#include "User.H"
// static class member initial definitions
Bot * Interp::bot = 0;
pthread_mutex_t Interp::mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
-typedef SCM (*SCMFunc)();
+typedef scm_t_subr SCMFunc;
SCM
Interp::ScmApplyWrapper (void *data)
SCM
Interp::LazyApplyWrapper(void *data)
{
- return scm_internal_lazy_catch(SCM_BOOL_T,
+ return scm_internal_catch(SCM_BOOL_T,
(scm_t_catch_body) Interp::ScmApplyWrapper,
data,
(scm_t_catch_handler) Interp::LazyHandler,
static SCM
lazy_eval_file(char *filename)
{
- return scm_internal_lazy_catch(SCM_BOOL_T,
- (scm_t_catch_body) scm_c_primitive_load,
+ return scm_internal_catch(SCM_BOOL_T,
+ (scm_t_catch_body) scm_c_primitive_load_path,
filename,
(scm_t_catch_handler) Interp::LazyHandler, 0);
}
static SCM
lazy_eval_string(char *str)
{
- return scm_internal_lazy_catch(SCM_BOOL_T,
+ return scm_internal_catch(SCM_BOOL_T,
(scm_t_catch_body) scm_c_eval_string, str,
(scm_t_catch_handler) Interp::LazyHandler, 0);
}
{
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));
+
+ // user channel modes
+ scm_c_define ("bot:mode/op", scm_from_int (User::OP_MODE));
+ scm_c_define ("bot:mode/voice", scm_from_int (User::VOICE_MODE));
+ scm_c_define ("bot:mode/away", scm_from_int (User::AWAY_MODE));
+ scm_c_define ("bot:mode/ircop", scm_from_int (User::IRCOP_MODE));
// 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_long2num (ShitEntry::SHIT_NOSHIT));
- scm_c_define ("bot:shit/no-op", scm_long2num (ShitEntry::SHIT_NOOP));
- scm_c_define ("bot:shit/no-join", scm_long2num (ShitEntry::SHIT_NOJOIN));
+ 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_long2num (ShitEntry::SHIT_NODEBAN));
+ 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/").c_str ()));
// 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/who", scm_long2num (Hook::SEND_WHO));
- scm_c_define ("hooks/send/whois", scm_long2num (Hook::SEND_WHOIS));
+ 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);
bot_new_procedure ("bot:change-command-level",
(SCMFunc)ScriptCommands::ChangeCommandLevel,
2, 0, 0);
+ scm_c_define_gsubr ("bot:channel-users", 1, 0, 0,
+ (SCMFunc)ScriptCommands::ChannelUsers);
scm_c_define_gsubr ("bot:ctcp", 3, 0, 0,
(SCMFunc)ScriptCommands::CTCP);
scm_c_define_gsubr ("bot:ctcp-reply", 3, 0, 0,
scm_c_export ("the-bot-module", 0);
// load bobot-utils
- scm_primitive_load
- (scm_makfrom0str (String(PREFIX) +
- "/share/bobotpp/scripts/bobot-utils.scm"));
- return SCM_UNSPECIFIED;
+ return scm_primitive_load_path
+ (scm_from_locale_string ((String(PREFIX) +
+ "/share/bobotpp/scripts/bobot-utils.scm").c_str ()));
}
void
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);
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
bot = b;
scm_internal_catch(SCM_BOOL_T,
- (scm_t_catch_body) lazy_eval_string, (void *) static_cast<const char *> (command),
+ (scm_t_catch_body) lazy_eval_string, (void *) static_cast<const char *> (command.c_str ()),
(scm_t_catch_handler) Interp::EmptyHandler, 0);
#ifdef MULTITHREAD
bot = b;
scm_internal_catch(SCM_BOOL_T,
(scm_t_catch_body) lazy_eval_file,
- (void *)static_cast<const char * >(filename),
+ (void *)static_cast<const char * >(filename.c_str ()),
(scm_t_catch_handler) Interp::EmptyHandler, 0);
#ifdef MULTITHREAD
// We release the lock
HCoop / clinton / bobotpp.git / blobdiff