X-Git-Url: http://git.hcoop.net/clinton/bobotpp.git/blobdiff_plain/af8c61feb3cc1a0ffe75415ff9b1cdcb20376ae8..815a1816c8a1ee14b28c776bf92c172b1fcdf13a:/source/Interp.C diff --git a/source/Interp.C b/source/Interp.C index 68d9a56..e634d35 100644 --- a/source/Interp.C +++ b/source/Interp.C @@ -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 @@ -14,24 +14,31 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +// 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 -#include "Macros.H" -#include "Commands.H" -#include "Interp.H" +#include "Bot.H" #include "BotInterp.H" - -#include +#include "Commands.H" +#include "Macros.H" +#include "ScriptCommands.H" +#include "ShitEntry.H" +#include "User.H" // static class member initial definitions Bot * Interp::bot = 0; SCM Interp::bot_module = 0; + #ifdef MULTITHREAD pthread_mutex_t Interp::mutex = PTHREAD_MUTEX_INITIALIZER; #endif @@ -39,7 +46,7 @@ pthread_mutex_t Interp::mutex = PTHREAD_MUTEX_INITIALIZER; typedef SCM (*SCMFunc)(); SCM -scm_apply_wrapper(void *data) +Interp::ScmApplyWrapper (void *data) { #ifdef MULTITHREAD // pthread_mutex_lock (&Interp::mutex); @@ -55,6 +62,56 @@ scm_apply_wrapper(void *data) return SCM_BOOL_T; } +SCM +Interp::LazyHandler (void *data, SCM tag, SCM throw_args) +{ + SCM log_port = Interp::bot->botInterp->ScriptLog(); + SCM eport = scm_set_current_error_port(log_port); + + scm_handle_by_message_noexit((void *)"bobot++", tag, throw_args); + scm_force_output(log_port); + scm_set_current_error_port(eport); + scm_ithrow(tag, throw_args, 1); + return SCM_UNSPECIFIED; /* never returns */ +} + +SCM +Interp::EmptyHandler(void *data, SCM tag, SCM args) +{ + return SCM_UNSPECIFIED; +} + + +SCM +Interp::LazyApplyWrapper(void *data) +{ + return scm_internal_lazy_catch(SCM_BOOL_T, + (scm_t_catch_body) Interp::ScmApplyWrapper, + data, + (scm_t_catch_handler) Interp::LazyHandler, + 0); +} + + +static SCM +lazy_eval_file(char *filename) +{ + return scm_internal_lazy_catch(SCM_BOOL_T, + (scm_t_catch_body) scm_c_primitive_load, + filename, + (scm_t_catch_handler) Interp::LazyHandler, 0); +} + +static SCM +lazy_eval_string(char *str) +{ + return scm_internal_lazy_catch(SCM_BOOL_T, + (scm_t_catch_body) scm_c_eval_string, str, + (scm_t_catch_handler) Interp::LazyHandler, 0); +} + + + #define bot_new_procedure(a, b, c, d, e) scm_c_define_gsubr (a, c, d, e, b); scm_c_export (a, 0) #define scm_c_define_gsubr(a, b, c, d, e) scm_c_define_gsubr (a, b, c, d, e); scm_c_export (a, 0) #define scm_c_define(a, b) scm_c_define (a, b); scm_c_export (a, 0) @@ -64,61 +121,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/").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/leave", scm_long2num(Hook::LEAVE)); - scm_c_define ("hooks/part", scm_long2num(Hook::LEAVE)); - 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/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_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); @@ -132,6 +199,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, @@ -153,6 +224,10 @@ interp_init_helper (void* unused) bot_new_procedure ("bot:nextserver", (SCMFunc)ScriptCommands::NextServer, 0, 0, 0); bot_new_procedure ("bot:nick", (SCMFunc)ScriptCommands::Nick, 1, 0, 0); + + scm_c_define_gsubr ("bot:notice", 2, 0, 0, + (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); bot_new_procedure ("bot:reconnect", (SCMFunc)ScriptCommands::Reconnect, @@ -167,6 +242,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); @@ -193,10 +270,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); } #undef bot_new_procedure @@ -210,11 +283,12 @@ interp_post_startup_helper (void *bot_module) SCM module = static_cast (bot_module); scm_c_define ("the-bot-module", module); scm_c_export ("the-bot-module", 0); + // load bobot-utils scm_primitive_load - (scm_makfrom0str (String(PREFIX) + - "/share/bobotpp/scripts/bobot-utils.scm")); - return 0; + (scm_from_locale_string ((String(PREFIX) + + "/share/bobotpp/scripts/bobot-utils.scm").c_str ())); + return SCM_UNSPECIFIED; } void @@ -222,6 +296,13 @@ 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); @@ -230,7 +311,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 @@ -242,7 +325,9 @@ Interp::Execute(Bot *b, String command) #endif bot = b; - gh_eval_str_with_catch (command, ErrorHandler); + scm_internal_catch(SCM_BOOL_T, + (scm_t_catch_body) lazy_eval_string, (void *) static_cast (command.c_str ()), + (scm_t_catch_handler) Interp::EmptyHandler, 0); #ifdef MULTITHREAD // We release the lock @@ -250,12 +335,6 @@ Interp::Execute(Bot *b, String command) #endif } -void load_script_helper (void* file) -{ - String filename = *static_cast (file); - scm_c_use_module ("guile-user"); - gh_eval_file_with_catch(filename, Interp::ErrorHandler); -} void Interp::LoadScript(Bot *b, String filename) @@ -265,19 +344,14 @@ Interp::LoadScript(Bot *b, String filename) pthread_mutex_lock(&mutex); #endif bot = b; - //scm_c_define_module ("", load_script_helper, &filename); - gh_eval_file_with_catch(filename, ErrorHandler); + scm_internal_catch(SCM_BOOL_T, + (scm_t_catch_body) lazy_eval_file, + (void *)static_cast(filename.c_str ()), + (scm_t_catch_handler) Interp::EmptyHandler, 0); #ifdef MULTITHREAD // We release the lock pthread_mutex_unlock(&mutex); #endif } -SCM -Interp::ErrorHandler(void *data, SCM tag, SCM throw_args) -{ - bot->botInterp->ScriptLog(throw_args); - return SCM_BOOL_F; -} - #endif