[project @ 2005-07-04 01:48:38 by unknown_lamer]

[clinton/bobotpp.git] / source / Interp.C

diff --git a/source/Interp.C b/source/Interp.C
index 0b4ee35..161b89f 100644 (file)
--- a/source/Interp.C
+++ b/source/Interp.C
@@ -14,7 +14,8 @@
 
 // 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02110-1301, USA.
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -40,7 +41,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);
@@ -56,6 +57,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)
@@ -100,11 +151,10 @@ interp_init_helper (void* unused)
   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/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));
@@ -200,8 +250,10 @@ interp_init_helper (void* unused)
                      (SCMFunc)ScriptCommands::sendDCCChatMessage);
 
   // "Low Level" Message functuions
-  scm_c_define_gsubr ("bot:send-CTCP", 3, 0, 0,
+  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
@@ -220,7 +272,7 @@ interp_post_startup_helper (void *bot_module)
   scm_primitive_load 
     (scm_makfrom0str (String(PREFIX) + 
                      "/share/bobotpp/scripts/bobot-utils.scm"));
-  return 0;
+  return SCM_UNSPECIFIED;
 }
 
 void
@@ -249,7 +301,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<const char *> (command),
+                    (scm_t_catch_handler) Interp::EmptyHandler, 0);
   
 #ifdef MULTITHREAD
   // We release the lock
@@ -257,12 +311,6 @@ Interp::Execute(Bot *b, String command)
 #endif
 }
 
-void load_script_helper (void* file)
-{
-  String filename = *static_cast<String*> (file);
-  scm_c_use_module ("guile-user");
-  gh_eval_file_with_catch(filename, Interp::ErrorHandler);
-}
 
 void
 Interp::LoadScript(Bot *b, String filename)
@@ -272,19 +320,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<const char * >(filename),
+                    (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