nagachika	2016-06-14 03:48:35 +0900 (Tue, 14 Jun 2016)

  New Revision: 55404

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

  Log:
    merge revision(s) 55010: [Backport #12332]
    
    * proc.c: fix RDoc of Proc#===/call/yield/[]
      [Bug #12332]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/proc.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55403)
+++ ruby_2_3/version.h	(revision 55404)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
 #define RUBY_RELEASE_DATE "2016-06-14"
-#define RUBY_PATCHLEVEL 128
+#define RUBY_PATCHLEVEL 129
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 6
Index: ruby_2_3/proc.c
===================================================================
--- ruby_2_3/proc.c	(revision 55403)
+++ ruby_2_3/proc.c	(revision 55404)
@@ -727,6 +727,10 @@ rb_block_lambda(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/proc.c#L727
 /* CHECKME: are the argument checking semantics correct? */
 
 /*
+ *  Document-method: call
+ *  Document-method: []
+ *  Document-method: yield
+ *
  *  call-seq:
  *     prc.call(params,...)   -> obj
  *     prc[params,...]        -> obj
@@ -2898,6 +2902,13 @@ Init_Proc(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/proc.c#L2902
     rb_add_method(rb_cProc, rb_intern("yield"), VM_METHOD_TYPE_OPTIMIZED,
 		  (void *)OPTIMIZED_METHOD_TYPE_CALL, METHOD_VISI_PUBLIC);
 
+#if 0 /* for RDoc */
+    rb_define_method(rb_cProc, "call", proc_call, -1);
+    rb_define_method(rb_cProc, "[]", proc_call, -1);
+    rb_define_method(rb_cProc, "===", proc_call, -1);
+    rb_define_method(rb_cProc, "yield", proc_call, -1);
+#endif
+
     rb_define_method(rb_cProc, "to_proc", proc_to_proc, 0);
     rb_define_method(rb_cProc, "arity", proc_arity, 0);
     rb_define_method(rb_cProc, "clone", proc_clone, 0);
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 55403)
+++ ruby_2_3/ChangeLog	(revision 55404)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Jun 14 03:47:29 2016  Eric Wong  <e@8...>
+
+	* proc.c: fix RDoc of Proc#===/call/yield/[]
+	  [Bug #12332]
+
 Tue Jun 14 03:34:27 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* variable.c (rb_local_constants_i): exclude hidden constants.

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55010


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