diff options
Diffstat (limited to 'ext/tk/tcltklib.c')
-rw-r--r-- | ext/tk/tcltklib.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 46159076db..4a1d3b8317 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -1894,7 +1894,7 @@ set_max_block_time(self, time) default: { - VALUE tmp = rb_funcall(time, ID_inspect, 0, 0); + VALUE tmp = rb_funcallv(time, ID_inspect, 0, 0); rb_raise(rb_eArgError, "invalid value for time: '%s'", StringValuePtr(tmp)); } @@ -3109,7 +3109,7 @@ ip_set_exc_message(interp, exc) thr_crit_bup = rb_thread_critical; rb_thread_critical = Qtrue; - msg = rb_funcall(exc, ID_message, 0, 0); + msg = rb_funcallv(exc, ID_message, 0, 0); StringValue(msg); #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0) @@ -3123,7 +3123,7 @@ ip_set_exc_message(interp, exc) /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */ encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(enc)); } else { - enc = rb_funcall(enc, ID_to_s, 0, 0); + enc = rb_funcallv(enc, ID_to_s, 0, 0); /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */ encoding = Tcl_GetEncoding((Tcl_Interp*)NULL, RSTRING_PTR(enc)); } @@ -3176,11 +3176,11 @@ TkStringValue(obj) default: if (rb_respond_to(obj, ID_to_s)) { - return rb_funcall(obj, ID_to_s, 0, 0); + return rb_funcallv(obj, ID_to_s, 0, 0); } } - return rb_funcall(obj, ID_inspect, 0, 0); + return rb_funcallv(obj, ID_inspect, 0, 0); } static int @@ -3298,7 +3298,7 @@ tcl_protect_core(interp, proc, data) /* should not raise exception */ rb_thread_critical = Qtrue; DUMP1("set backtrace"); - if (!NIL_P(backtrace = rb_funcall(exc, ID_backtrace, 0, 0))) { + if (!NIL_P(backtrace = rb_funcallv(exc, ID_backtrace, 0, 0))) { backtrace = rb_ary_join(backtrace, rb_str_new2("\n")); Tcl_AddErrorInfo(interp, StringValuePtr(backtrace)); } @@ -7245,7 +7245,7 @@ tk_funcall(func, argc, argv, obj) DUMP1("raise exception"); /* rb_exc_raise(ret); */ rb_exc_raise(rb_exc_new3(rb_obj_class(ret), - rb_funcall(ret, ID_to_s, 0, 0))); + rb_funcallv(ret, ID_to_s, 0, 0))); } DUMP1("exit tk_funcall"); @@ -7722,7 +7722,7 @@ ip_eval(self, str) DUMP1("raise exception"); /* rb_exc_raise(ret); */ rb_exc_raise(rb_exc_new3(rb_obj_class(ret), - rb_funcall(ret, ID_to_s, 0, 0))); + rb_funcallv(ret, ID_to_s, 0, 0))); } return ret; @@ -7949,7 +7949,7 @@ lib_toUTF8_core(ip_obj, src, encodename) volatile VALUE enc; #ifdef HAVE_RUBY_ENCODING_H - enc = rb_funcall(rb_obj_encoding(str), ID_to_s, 0, 0); + enc = rb_funcallv(rb_obj_encoding(str), ID_to_s, 0, 0); #else enc = rb_attr_get(str, ID_at_enc); #endif @@ -7962,7 +7962,7 @@ lib_toUTF8_core(ip_obj, src, encodename) encoding = (Tcl_Encoding)NULL; } else { /* StringValue(enc); */ - enc = rb_funcall(enc, ID_to_s, 0, 0); + enc = rb_funcallv(enc, ID_to_s, 0, 0); /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */ if (!RSTRING_LEN(enc)) { encoding = (Tcl_Encoding)NULL; @@ -8153,7 +8153,7 @@ lib_fromUTF8_core(ip_obj, src, encodename) encoding = (Tcl_Encoding)NULL; } else { /* StringValue(enc); */ - enc = rb_funcall(enc, ID_to_s, 0, 0); + enc = rb_funcallv(enc, ID_to_s, 0, 0); /* encoding = Tcl_GetEncoding(interp, RSTRING_PTR(enc)); */ if (!RSTRING_LEN(enc)) { encoding = (Tcl_Encoding)NULL; @@ -8408,7 +8408,7 @@ lib_set_system_encoding(self, enc_name) return lib_get_system_encoding(self); } - enc_name = rb_funcall(enc_name, ID_to_s, 0, 0); + enc_name = rb_funcallv(enc_name, ID_to_s, 0, 0); if (Tcl_SetSystemEncoding((Tcl_Interp *)NULL, StringValuePtr(enc_name)) != TCL_OK) { rb_raise(rb_eArgError, "unknown encoding name '%s'", @@ -9218,7 +9218,7 @@ ip_invoke_with_position(argc, argv, obj, position) DUMP1("raise exception"); /* rb_exc_raise(ret); */ rb_exc_raise(rb_exc_new3(rb_obj_class(ret), - rb_funcall(ret, ID_to_s, 0, 0))); + rb_funcallv(ret, ID_to_s, 0, 0))); } DUMP1("exit ip_invoke"); @@ -10187,7 +10187,7 @@ encoding_table_get_name_core(table, enc_arg, error_mode) /* 1st: default encoding setting of interp */ if (ptr && NIL_P(enc)) { if (rb_respond_to(interp, ID_encoding_name)) { - enc = rb_funcall(interp, ID_encoding_name, 0, 0); + enc = rb_funcallv(interp, ID_encoding_name, 0, 0); } } /* 2nd: Encoding.default_internal */ @@ -10230,7 +10230,7 @@ encoding_table_get_name_core(table, enc_arg, error_mode) } else { /* String or Symbol? */ - name = rb_funcall(enc, ID_to_s, 0, 0); + name = rb_funcallv(enc, ID_to_s, 0, 0); if (!NIL_P(rb_hash_lookup(table, name))) { /* find */ @@ -10264,7 +10264,7 @@ encoding_table_get_name_core(table, enc_arg, error_mode) } if (RTEST(error_mode)) { - enc = rb_funcall(enc_arg, ID_to_s, 0, 0); + enc = rb_funcallv(enc_arg, ID_to_s, 0, 0); rb_raise(rb_eArgError, "unsupported Tk encoding '%s'", RSTRING_PTR(enc)); } return Qnil; @@ -10342,7 +10342,7 @@ encoding_table_get_name_core(table, enc, error_mode) { volatile VALUE name = Qnil; - enc = rb_funcall(enc, ID_to_s, 0, 0); + enc = rb_funcallv(enc, ID_to_s, 0, 0); name = rb_hash_lookup(table, enc); if (!NIL_P(name)) { |