diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-04-18 08:43:10 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-04-18 08:43:10 +0000 |
commit | bce4ed2f72db35fe870a226f53fbb4dc24eaedab (patch) | |
tree | 6af16bfe9aadfd4ba97be7074649669917f6672a /ext/tk/tcltklib.c | |
parent | ef658049031108b4b592aef1740e9eeff5c4264e (diff) |
* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
* ext/tk/lib/tk.rb: update RELEASE_DATE.
* ext/tk/tcltklib.c: forget to reset a Tcl interpreter.
* ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/tcltklib.c')
-rw-r--r-- | ext/tk/tcltklib.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index ecb73e6743..ebc2ac5d76 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -4,7 +4,7 @@ * Oct. 24, 1997 Y. Matsumoto */ -#define TCLTKLIB_RELEASE_DATE "2006-04-06" +#define TCLTKLIB_RELEASE_DATE "2006-04-18" #include "ruby.h" #include "rubysig.h" @@ -5118,7 +5118,10 @@ ip_make_safe_core(interp, argc, argv) } if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) { - return rb_exc_new2(rb_eRuntimeError, Tcl_GetStringResult(ptr->ip)); + /* return rb_exc_new2(rb_eRuntimeError, + Tcl_GetStringResult(ptr->ip)); */ + return create_ip_exc(interp, rb_eRuntimeError, + Tcl_GetStringResult(ptr->ip)); } ptr->allow_ruby_exit = 0; @@ -7050,7 +7053,10 @@ ip_get_variable2_core(interp, argc, argv) if (ret == (Tcl_Obj*)NULL) { volatile VALUE exc; - exc = rb_exc_new2(rb_eRuntimeError, Tcl_GetStringResult(ptr->ip)); + /* exc = rb_exc_new2(rb_eRuntimeError, + Tcl_GetStringResult(ptr->ip)); */ + exc = create_ip_exc(interp, rb_eRuntimeError, + Tcl_GetStringResult(ptr->ip)); /* Tcl_Release(ptr->ip); */ rbtk_release_ip(ptr); rb_thread_critical = thr_crit_bup; @@ -7186,7 +7192,10 @@ ip_set_variable2_core(interp, argc, argv) if (ret == (Tcl_Obj*)NULL) { volatile VALUE exc; - exc = rb_exc_new2(rb_eRuntimeError, Tcl_GetStringResult(ptr->ip)); + /* exc = rb_exc_new2(rb_eRuntimeError, + Tcl_GetStringResult(ptr->ip)); */ + exc = create_ip_exc(interp, rb_eRuntimeError, + Tcl_GetStringResult(ptr->ip)); /* Tcl_Release(ptr->ip); */ rbtk_release_ip(ptr); rb_thread_critical = thr_crit_bup; @@ -7303,7 +7312,10 @@ ip_unset_variable2_core(interp, argc, argv) if (ptr->return_value == TCL_ERROR) { if (FIX2INT(flag) & TCL_LEAVE_ERR_MSG) { - return rb_exc_new2(rb_eRuntimeError, Tcl_GetStringResult(ptr->ip)); + /* return rb_exc_new2(rb_eRuntimeError, + Tcl_GetStringResult(ptr->ip)); */ + return create_ip_exc(interp, rb_eRuntimeError, + Tcl_GetStringResult(ptr->ip)); } return Qfalse; } |