[project @ 2005-06-28 10:08:45 by unknown_lamer]

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

diff --git a/source/Interp.C b/source/Interp.C
index 94c5045..1107f57 100644 (file)
--- a/source/Interp.C
+++ b/source/Interp.C
@@ -56,6 +56,53 @@ scm_apply_wrapper(void *data)
   return SCM_BOOL_T;
 }
 
+static SCM
+lazy_handler(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
+empty_handler(void *data, SCM tag, SCM args)
+{
+  return SCM_UNSPECIFIED;
+}
+
+
+SCM
+lazy_apply_wrapper(void *data)
+{
+  return scm_internal_lazy_catch(SCM_BOOL_T,
+                                (scm_t_catch_body) scm_apply_wrapper, data,
+                                (scm_t_catch_handler) lazy_handler, 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) lazy_handler, 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) lazy_handler, 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)
@@ -251,7 +298,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) empty_handler, 0);
   
 #ifdef MULTITHREAD
   // We release the lock
@@ -259,12 +308,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)
@@ -274,19 +317,13 @@ 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) empty_handler, 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