ruby-changes:21381
From: kosaki <ko1@a...>
Date: Sat, 8 Oct 2011 18:42:52 +0900 (JST)
Subject: [ruby-changes:21381] kosaki:r33430 (ruby_1_9_3): merge revision(s) 33390:
kosaki 2011-10-08 18:42:41 +0900 (Sat, 08 Oct 2011) New Revision: 33430 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33430 Log: merge revision(s) 33390: * proc.c (proc_call): Fix documentation of Proc#call vs Proc#===. [Ruby 1.9 - Bug #5349] Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/proc.c branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 33429) +++ ruby_1_9_3/ChangeLog (revision 33430) @@ -1,3 +1,8 @@ +Sat Oct 8 05:38:29 2011 Eric Hodel <drbrain@s...> + + * proc.c (proc_call): Fix documentation of Proc#call vs Proc#===. + [Ruby 1.9 - Bug #5349] + Tue Sep 27 13:05:39 2011 Martin Bosslet <Martin.Bosslet@g...> * ext/openssl/ossl_asn1.c: fix int_ossl_asn1_decode0_cons when being Index: ruby_1_9_3/proc.c =================================================================== --- ruby_1_9_3/proc.c (revision 33429) +++ ruby_1_9_3/proc.c (revision 33430) @@ -493,6 +493,16 @@ return rb_block_lambda(); } +/* Document-method: === + * + * call-seq: + * proc === obj -> result_of_proc + * + * Invokes the block with +obj+ as the proc's parameter like Proc#call. It + * is to allow a proc object to be a target of +when+ clause in a case + * statement. + */ + /* CHECKME: are the argument checking semantics correct? */ /* @@ -508,10 +518,10 @@ * to an array). Note that prc.() invokes prc.call() with the parameters * given. It's a syntax sugar to hide "call". * - * For procs created using <code>Kernel.proc</code>, generates an - * error if the wrong number of parameters - * are passed to a proc with multiple parameters. For procs created using - * <code>Proc.new</code>, extra parameters are silently discarded. + * For procs created using <code>Kernel.proc</code> an error is generated + * if the wrong number of parameters are passed to a proc with multiple + * parameters. For procs created using <code>Proc.new</code>, extra + * parameters are silently discarded. * * Returns the value of the last expression evaluated in the block. See * also <code>Proc#yield</code>. @@ -529,14 +539,6 @@ * from prog.rb:5 */ -/* - * call-seq: - * prc === obj -> result_of_proc - * - * Invokes the block, with <i>obj</i> as the block's parameter. It is - * to allow a proc object to be a target of +when+ clause in the case statement. - */ - static VALUE proc_call(int argc, VALUE *argv, VALUE procval) { Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 33429) +++ ruby_1_9_3/version.h (revision 33430) @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" #define RUBY_PATCHLEVEL -1 -#define RUBY_RELEASE_DATE "2011-09-27" +#define RUBY_RELEASE_DATE "2011-10-08" #define RUBY_RELEASE_YEAR 2011 -#define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_MONTH 10 +#define RUBY_RELEASE_DAY 8 #include "ruby/version.h" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/