[前][次][番号順一覧][スレッド一覧]

ruby-changes:37531

From: nobu <ko1@a...>
Date: Mon, 16 Feb 2015 13:09:16 +0900 (JST)
Subject: [ruby-changes:37531] nobu:r49612 (trunk): use rb_funcallv

nobu	2015-02-16 13:08:52 +0900 (Mon, 16 Feb 2015)

  New Revision: 49612

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49612

  Log:
    use rb_funcallv
    
    * use rb_funcallv() for no arguments call instead of variadic
      rb_funcall().

  Modified files:
    trunk/class.c
    trunk/dir.c
    trunk/encoding.c
    trunk/enum.c
    trunk/error.c
    trunk/ext/openssl/ossl_pkey.c
    trunk/ext/socket/socket.c
    trunk/ext/tk/tcltklib.c
    trunk/ext/tk/tkutil/tkutil.c
    trunk/numeric.c
    trunk/object.c
    trunk/parse.y
    trunk/proc.c
    trunk/range.c
    trunk/string.c
Index: encoding.c
===================================================================
--- encoding.c	(revision 49611)
+++ encoding.c	(revision 49612)
@@ -765,8 +765,8 @@ rb_enc_get_index(VALUE obj) https://github.com/ruby/ruby/blob/trunk/encoding.c#L765
 	}
 	break;
       case T_FILE:
-	tmp = rb_funcall(obj, rb_intern("internal_encoding"), 0, 0);
-	if (NIL_P(tmp)) obj = rb_funcall(obj, rb_intern("external_encoding"), 0, 0);
+	tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0);
+	if (NIL_P(tmp)) obj = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
 	else obj = tmp;
 	if (NIL_P(obj)) break;
       case T_DATA:
Index: enum.c
===================================================================
--- enum.c	(revision 49611)
+++ enum.c	(revision 49612)
@@ -219,7 +219,7 @@ enum_find(int argc, VALUE *argv, VALUE o https://github.com/ruby/ruby/blob/trunk/enum.c#L219
 	return memo->u1.value;
     }
     if (!NIL_P(if_none)) {
-	return rb_funcall(if_none, id_call, 0, 0);
+	return rb_funcallv(if_none, id_call, 0, 0);
     }
     return Qnil;
 }
@@ -2335,7 +2335,7 @@ zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, https://github.com/ruby/ruby/blob/trunk/enum.c#L2335
 static VALUE
 call_next(VALUE *v)
 {
-    return v[0] = rb_funcall(v[1], id_next, 0, 0);
+    return v[0] = rb_funcallv(v[1], id_next, 0, 0);
 }
 
 static VALUE
Index: string.c
===================================================================
--- string.c	(revision 49611)
+++ string.c	(revision 49612)
@@ -3534,7 +3534,7 @@ rb_str_upto(int argc, VALUE *argv, VALUE https://github.com/ruby/ruby/blob/trunk/string.c#L3534
 	    while (rb_funcall(b, op, 1, e)) {
 		args[1] = b;
 		rb_yield(rb_str_format(numberof(args), args, fmt));
-		b = rb_funcall(b, succ, 0, 0);
+		b = rb_funcallv(b, succ, 0, 0);
 	    }
 	}
 	return beg;
@@ -3544,12 +3544,12 @@ rb_str_upto(int argc, VALUE *argv, VALUE https://github.com/ruby/ruby/blob/trunk/string.c#L3544
     n = rb_str_cmp(beg, end);
     if (n > 0 || (excl && n == 0)) return beg;
 
-    after_end = rb_funcall(end, succ, 0, 0);
+    after_end = rb_funcallv(end, succ, 0, 0);
     current = rb_str_dup(beg);
     while (!rb_str_equal(current, after_end)) {
 	VALUE next = Qnil;
 	if (excl || !rb_str_equal(current, end))
-	    next = rb_funcall(current, succ, 0, 0);
+	    next = rb_funcallv(current, succ, 0, 0);
 	rb_yield(current);
 	if (NIL_P(next)) break;
 	current = next;
Index: object.c
===================================================================
--- object.c	(revision 49611)
+++ object.c	(revision 49612)
@@ -471,7 +471,7 @@ rb_any_to_s(VALUE obj) https://github.com/ruby/ruby/blob/trunk/object.c#L471
 VALUE
 rb_inspect(VALUE obj)
 {
-    VALUE str = rb_obj_as_string(rb_funcall(obj, id_inspect, 0, 0));
+    VALUE str = rb_obj_as_string(rb_funcallv(obj, id_inspect, 0, 0));
     rb_encoding *ext = rb_default_external_encoding();
     if (!rb_enc_asciicompat(ext)) {
 	if (!rb_enc_str_asciionly_p(str))
Index: range.c
===================================================================
--- range.c	(revision 49611)
+++ range.c	(revision 49612)
@@ -273,7 +273,7 @@ range_each_func(VALUE range, rb_block_ca https://github.com/ruby/ruby/blob/trunk/range.c#L273
     if (EXCL(range)) {
 	while (r_lt(v, e)) {
 	    (*func) (v, arg, 0, 0, 0);
-	    v = rb_funcall(v, id_succ, 0, 0);
+	    v = rb_funcallv(v, id_succ, 0, 0);
 	}
     }
     else {
@@ -281,7 +281,7 @@ range_each_func(VALUE range, rb_block_ca https://github.com/ruby/ruby/blob/trunk/range.c#L281
 	    (*func) (v, arg, 0, 0, 0);
 	    if (c == (int)INT2FIX(0))
 		break;
-	    v = rb_funcall(v, id_succ, 0, 0);
+	    v = rb_funcallv(v, id_succ, 0, 0);
 	}
     }
 }
Index: proc.c
===================================================================
--- proc.c	(revision 49611)
+++ proc.c	(revision 49612)
@@ -2306,13 +2306,13 @@ method_inspect(VALUE method) https://github.com/ruby/ruby/blob/trunk/proc.c#L2306
 static VALUE
 mproc(VALUE method)
 {
-    return rb_funcall2(rb_mRubyVMFrozenCore, idProc, 0, 0);
+    return rb_funcallv(rb_mRubyVMFrozenCore, idProc, 0, 0);
 }
 
 static VALUE
 mlambda(VALUE method)
 {
-    return rb_funcall(rb_mRubyVMFrozenCore, idLambda, 0, 0);
+    return rb_funcallv(rb_mRubyVMFrozenCore, idLambda, 0, 0);
 }
 
 static VALUE
Index: dir.c
===================================================================
--- dir.c	(revision 49611)
+++ dir.c	(revision 49612)
@@ -575,7 +575,7 @@ dir_inspect(VALUE dir) https://github.com/ruby/ruby/blob/trunk/dir.c#L575
 	rb_str_cat2(str, ">");
 	return str;
     }
-    return rb_funcall(dir, rb_intern("to_s"), 0, 0);
+    return rb_funcallv(dir, rb_intern("to_s"), 0, 0);
 }
 
 #ifdef HAVE_DIRFD
Index: parse.y
===================================================================
--- parse.y	(revision 49611)
+++ parse.y	(revision 49612)
@@ -9750,7 +9750,7 @@ negate_lit(VALUE lit) https://github.com/ruby/ruby/blob/trunk/parse.y#L9750
       case T_BIGNUM:
       case T_RATIONAL:
       case T_COMPLEX:
-	lit = rb_funcall(lit,tUMINUS,0,0);
+	lit = rb_funcallv(lit, tUMINUS, 0, 0);
 	break;
       case T_FLOAT:
 #if USE_FLONUM
Index: class.c
===================================================================
--- class.c	(revision 49611)
+++ class.c	(revision 49612)
@@ -1915,7 +1915,7 @@ unknown_keyword_error(VALUE hash, const https://github.com/ruby/ruby/blob/trunk/class.c#L1915
 	st_data_t key = ID2SYM(table[i]);
 	st_delete(tbl, &key, NULL);
     }
-    keys = rb_funcall(hash, rb_intern("keys"), 0, 0);
+    keys = rb_funcallv(hash, rb_intern("keys"), 0, 0);
     if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword");
     rb_keyword_error("unknown", keys);
 }
Index: ext/tk/tcltklib.c
===================================================================
--- ext/tk/tcltklib.c	(revision 49611)
+++ ext/tk/tcltklib.c	(revision 49612)
@@ -1894,7 +1894,7 @@ set_max_block_time(self, time) https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L1894
 
     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) https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L3109
     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) https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L3123
         /* 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) https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L3176
 
     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) /* https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L3298
         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) https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L7245
         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) https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L7722
         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) https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L7949
             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) https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L7962
                         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, encodenam https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L8153
                 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) https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L8408
         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, https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L9218
         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_ https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L10187
   /* 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_ https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L10230
 
   } 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_ https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L10264
   }
 
   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, https://github.com/ruby/ruby/blob/trunk/ext/tk/tcltklib.c#L10342
 {
   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)) {
Index: ext/tk/tkutil/tkutil.c
===================================================================
--- ext/tk/tkutil/tkutil.c	(revision 49611)
+++ ext/tk/tkutil/tkutil.c	(revision 49612)
@@ -172,7 +172,7 @@ tk_install_cmd_core(cmd) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L172
     volatile VALUE id_num;
 
     id_num = ULONG2NUM(CALLBACK_ID_NUM++);
-    id_num = rb_funcall(id_num, ID_to_s, 0, 0);
+    id_num = rb_funcallv(id_num, ID_to_s, 0, 0);
     id_num = rb_str_append(rb_str_new2(cmd_id_prefix), id_num);
     rb_hash_aset(CALLBACK_TABLE, id_num, cmd);
     return rb_str_append(rb_str_new2(cmd_id_head), id_num);
@@ -269,7 +269,7 @@ to_strkey(key, value, hash) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L269
     VALUE value;
     VALUE hash;
 {
-    rb_hash_aset(hash, rb_funcall(key, ID_to_s, 0, 0), value);
+    rb_hash_aset(hash, rb_funcallv(key, ID_to_s, 0, 0), value);
     return ST_CHECK;
 }
 
@@ -306,10 +306,10 @@ ary2list(ary, enc_flag, self) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L306
     volatile VALUE dst;
     volatile VALUE sys_enc, dst_enc, str_enc;
 
-    sys_enc = rb_funcall(cTclTkLib, ID_encoding, 0, 0);
+    sys_enc = rb_funcallv(cTclTkLib, ID_encoding, 0, 0);
     if (NIL_P(sys_enc)) {
-      sys_enc = rb_funcall(cTclTkLib, ID_encoding_system, 0, 0);
-      sys_enc = rb_funcall(sys_enc, ID_to_s, 0, 0);
+      sys_enc = rb_funcallv(cTclTkLib, ID_encoding_system, 0, 0);
+      sys_enc = rb_funcallv(sys_enc, ID_to_s, 0, 0);
     }
 
     if (NIL_P(enc_flag)) {
@@ -319,7 +319,7 @@ ary2list(ary, enc_flag, self) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L319
         dst_enc = enc_flag;
         req_chk_flag = 0;
     } else {
-        dst_enc = rb_funcall(enc_flag, ID_to_s, 0, 0);
+        dst_enc = rb_funcallv(enc_flag, ID_to_s, 0, 0);
         req_chk_flag = 0;
     }
 
@@ -345,7 +345,7 @@ ary2list(ary, enc_flag, self) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L345
             if (req_chk_flag) {
                 str_enc = rb_ivar_get(str_val, ID_at_enc);
                 if (!NIL_P(str_enc)) {
-                    str_enc = rb_funcall(str_enc, ID_to_s, 0, 0);
+                    str_enc = rb_funcallv(str_enc, ID_to_s, 0, 0);
                 } else {
                     str_enc = sys_enc;
                 }
@@ -392,7 +392,7 @@ ary2list(ary, enc_flag, self) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L392
                 if (req_chk_flag) {
                     str_enc = rb_ivar_get(str_val, ID_at_enc);
                     if (!NIL_P(str_enc)) {
-                        str_enc = rb_funcall(str_enc, ID_to_s, 0, 0);
+                        str_enc = rb_funcallv(str_enc, ID_to_s, 0, 0);
                     } else {
                         str_enc = sys_enc;
                     }
@@ -412,7 +412,7 @@ ary2list(ary, enc_flag, self) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L412
                 if (req_chk_flag) {
                     str_enc = rb_ivar_get(str_val, ID_at_enc);
                     if (!NIL_P(str_enc)) {
-                        str_enc = rb_funcall(str_enc, ID_to_s, 0, 0);
+                        str_enc = rb_funcallv(str_enc, ID_to_s, 0, 0);
                     } else {
                         str_enc = sys_enc;
                     }
@@ -460,10 +460,10 @@ ary2list2(ary, enc_flag, self) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L460
     volatile VALUE dst;
     volatile VALUE sys_enc, dst_enc, str_enc;
 
-    sys_enc = rb_funcall(cTclTkLib, ID_encoding, 0, 0);
+    sys_enc = rb_funcallv(cTclTkLib, ID_encoding, 0, 0);
     if (NIL_P(sys_enc)) {
-      sys_enc = rb_funcall(cTclTkLib, ID_encoding_system, 0, 0);
-      sys_enc = rb_funcall(sys_enc, ID_to_s, 0, 0);
+      sys_enc = rb_funcallv(cTclTkLib, ID_encoding_system, 0, 0);
+      sys_enc = rb_funcallv(sys_enc, ID_to_s, 0, 0);
     }
 
     if (NIL_P(enc_flag)) {
@@ -473,7 +473,7 @@ ary2list2(ary, enc_flag, self) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L473
         dst_enc = enc_flag;
         req_chk_flag = 0;
     } else {
-        dst_enc = rb_funcall(enc_flag, ID_to_s, 0, 0);
+        dst_enc = rb_funcallv(enc_flag, ID_to_s, 0, 0);
         req_chk_flag = 0;
     }
 
@@ -507,7 +507,7 @@ ary2list2(ary, enc_flag, self) https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L507
             if (req_chk_flag) {
                 str_enc = rb_ivar_get(str_val, ID_at_enc);
                 if (!NIL_P(str_enc)) {
-                    str_enc = rb_funcall(str_enc, ID_to_s, 0, 0);
+                    str_enc = rb_funcallv(str_enc, ID_to_s, 0, 0);
                 } else {
                     str_enc = sys_enc;
                 }
@@ -546,7 +546,7 @@ static VALUE https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L546
 key2keyname(key)
     VALUE key;
 {
-    return rb_str_append(rb_str_new2("-"), rb_funcall(key, ID_to_s, 0, 0));
+    return rb_str_append(rb_str_new2("-"), rb_funcallv(key, ID_to_s, 0, 0));
 }
 
 static VALUE
@@ -817,7 +817,7 @@ get_eval_string_core(obj, enc_flag, self https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L817
     case T_FLOAT:
     case T_FIXNUM:
     case T_BIGNUM:
-        return rb_funcall(obj, ID_to_s, 0, 0);
+        return rb_funcallv(obj, ID_to_s, 0, 0);
 
     case T_STRING:
         if (RTEST(enc_flag)) {
@@ -866,12 +866,12 @@ get_eval_string_core(obj, enc_flag, self https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L866
         return rb_str_new2("");
 
     case T_REGEXP:
-        return rb_funcall(obj, ID_source, 0, 0);
+        return rb_funcallv(obj, ID_source, 0, 0);
 
     default:
         if (rb_obj_is_kind_of(obj, cTkObject)) {
-            /* return rb_str_new3(rb_funcall(obj, ID_path, 0, 0)); */
-            return get_eval_string_core(rb_funcall(obj, ID_path, 0, 0),
+            /* return rb_str_new3(rb_funcallv(obj, ID_path, 0, 0)); */
+            return get_eval_string_core(rb_funcallv(obj, ID_path, 0, 0),
                                         enc_flag, self);
         }
 
@@ -888,15 +888,15 @@ get_eval_string_core(obj, enc_flag, self https://github.com/ruby/ruby/blob/trunk/ext/tk/tkutil/tkutil.c#L888
         if (obj == TK_None)  return Qnil;
 
         if (rb_obj_respond_to(obj, ID_to_eval, Qtrue)) {
-            /* return rb_funcall(obj, ID_to_eval, 0, 0); */
-            return get_eval_string_core(rb_funcall(obj, ID_to_eval, 0, 0),
+            /* return rb_funcallv(obj, ID_to_eval, 0, 0); */
+            return get_eval_string_core(rb_funcallv(obj, ID_to_eval, 0, 0),
                                         enc_flag, self);
         } else if (rb_obj_respond_to(obj, ID_path, Qtrue)) {
-            /* return rb_funcall(obj, ID_path, 0, 0); */
-            return get_eval_string_core(rb_funcall(obj, ID_path, 0, 0),
+            /* return rb_funcallv(obj, ID_path, 0, 0); */
+            return get_eval_string_core(rb_funcallv(obj, ID_path, 0, 0),
                                         enc_flag, self);
         } else if (rb_obj_respond_to(obj, ID_to_s, Qtrue)) {
-            return rb_funcall(obj, ID_to_s, 0, 0);
+            return rb_funcallv(obj, ID_to_s, 0, 0);
         }
     }
 
Index: ext/openssl/ossl_pkey.c
===================================================================
--- ext/openssl/ossl_pkey.c	(revision 49611)
+++ ext/openssl/ossl_pkey.c	(revision 49612)
@@ -199,7 +199,7 @@ GetPrivPKeyPtr(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_pkey.c#L199
 {
     EVP_PKEY *pkey;
 
 (... truncated)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]