ruby-changes:45787
From: naruse <ko1@a...>
Date: Sun, 12 Mar 2017 02:10:06 +0900 (JST)
Subject: [ruby-changes:45787] naruse:r57860 (ruby_2_4): merge revision(s) 57352: [Backport #13132]
naruse 2017-03-12 02:10:01 +0900 (Sun, 12 Mar 2017) New Revision: 57860 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57860 Log: merge revision(s) 57352: [Backport #13132] doc: improve documentation for Binding [ci skip] * remove explicit return from code examples * grammar fixes * other small fixes Patch by: Marcus Stollsteimer <sto.mar@w...> [ruby-core:79082] [Bug #13132] Modified directories: branches/ruby_2_4/ Modified files: branches/ruby_2_4/proc.c branches/ruby_2_4/version.h Index: ruby_2_4/proc.c =================================================================== --- ruby_2_4/proc.c (revision 57859) +++ ruby_2_4/proc.c (revision 57860) @@ -353,7 +353,7 @@ rb_binding_new(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L353 * environment. See also the description of class +Binding+. * * def get_binding(param) - * return binding + * binding * end * b = get_binding("hello") * eval("param", b) #=> "hello" @@ -375,7 +375,7 @@ rb_f_binding(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L375 * reporting syntax errors. * * def get_binding(param) - * return binding + * binding * end * b = get_binding("hello") * b.eval("param") #=> "hello" @@ -446,7 +446,7 @@ check_local_id(VALUE bindval, volatile V https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L446 * call-seq: * binding.local_variables -> Array * - * Returns the +symbol+ names of the binding's local variables + * Returns the names of the binding's local variables as symbols. * * def foo * a = 1 @@ -455,7 +455,7 @@ check_local_id(VALUE bindval, volatile V https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L455 * end * end * - * This method is short version of the following code. + * This method is the short version of the following code: * * binding.eval("local_variables") * @@ -475,7 +475,7 @@ bind_local_variables(VALUE bindval) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L475 * call-seq: * binding.local_variable_get(symbol) -> obj * - * Returns a +value+ of local variable +symbol+. + * Returns the value of the local variable +symbol+. * * def foo * a = 1 @@ -483,7 +483,7 @@ bind_local_variables(VALUE bindval) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L483 * binding.local_variable_get(:b) #=> NameError * end * - * This method is short version of the following code. + * This method is the short version of the following code: * * binding.eval("#{symbol}") * @@ -520,18 +520,19 @@ bind_local_variable_get(VALUE bindval, V https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L520 * bind = binding * bind.local_variable_set(:a, 2) # set existing local variable `a' * bind.local_variable_set(:b, 3) # create new local variable `b' - * # `b' exists only in binding. - * p bind.local_variable_get(:a) #=> 2 - * p bind.local_variable_get(:b) #=> 3 - * p a #=> 2 - * p b #=> NameError + * # `b' exists only in binding + * + * p bind.local_variable_get(:a) #=> 2 + * p bind.local_variable_get(:b) #=> 3 + * p a #=> 2 + * p b #=> NameError * end * - * This method is a similar behavior of the following code + * This method behaves similarly to the following code: * * binding.eval("#{symbol} = #{obj}") * - * if obj can be dumped in Ruby code. + * if +obj+ can be dumped in Ruby code. */ static VALUE bind_local_variable_set(VALUE bindval, VALUE sym, VALUE val) @@ -560,7 +561,7 @@ bind_local_variable_set(VALUE bindval, V https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L561 * call-seq: * binding.local_variable_defined?(symbol) -> obj * - * Returns a +true+ if a local variable +symbol+ exists. + * Returns +true+ if a local variable +symbol+ exists. * * def foo * a = 1 @@ -568,7 +569,7 @@ bind_local_variable_set(VALUE bindval, V https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L569 * binding.local_variable_defined?(:b) #=> false * end * - * This method is short version of the following code. + * This method is the short version of the following code: * * binding.eval("defined?(#{symbol}) == 'local-variable'") * @@ -1086,7 +1087,7 @@ iseq_location(const rb_iseq_t *iseq) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L1087 * prc.source_location -> [String, Integer] * * Returns the Ruby source filename and line number containing this proc - * or +nil+ if this proc was not defined in Ruby (i.e. native) + * or +nil+ if this proc was not defined in Ruby (i.e. native). */ VALUE @@ -2468,7 +2469,7 @@ rb_obj_method_location(VALUE obj, ID id) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L2469 * meth.source_location -> [String, Integer] * * Returns the Ruby source filename and line number containing this method - * or nil if this method was not defined in Ruby (i.e. native) + * or nil if this method was not defined in Ruby (i.e. native). */ VALUE @@ -3125,7 +3126,7 @@ Init_Proc(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/proc.c#L3126 * @secret = n * end * def get_binding - * return binding() + * binding * end * end * Index: ruby_2_4/version.h =================================================================== --- ruby_2_4/version.h (revision 57859) +++ ruby_2_4/version.h (revision 57860) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #define RUBY_VERSION "2.4.0" #define RUBY_RELEASE_DATE "2017-03-12" -#define RUBY_PATCHLEVEL 25 +#define RUBY_PATCHLEVEL 26 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r57352 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/