nagachika	2013-06-18 00:43:58 +0900 (Tue, 18 Jun 2013)

  New Revision: 41363

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

  Log:
    merge revision(s) 41348:
    
    * vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm_backtrace.c

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41362)
+++ ruby_2_0_0/ChangeLog	(revision 41363)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Jun 18 00:43:27 2013  Zachary Scott  <zachary@z...>
+
+	* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1
+
 Tue Jun 18 00:34:57 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 merge revision(s) 41347: [Backport #5048] [Backport #5465] [Backport #8319]
Index: ruby_2_0_0/vm_backtrace.c
===================================================================
--- ruby_2_0_0/vm_backtrace.c	(revision 41362)
+++ ruby_2_0_0/vm_backtrace.c	(revision 41363)
@@ -177,10 +177,27 @@ location_label(rb_backtrace_location_t * https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_backtrace.c#L177
  *
  * Usually consists of method, class, module, etc names with decoration.
  *
- * For example, using +caller_locations.rb+ from Thread::Backtrace::Location
+ * Consider the following example:
+ *
+ *	def foo
+ *	  puts caller_locations(0).first.label
+ *
+ *	  1.times do
+ *	    puts caller_locations(0).first.label
+ *
+ *	    1.times do
+ *	      puts caller_locations(0).first.label
+ *	    end
+ *
+ *	  end
+ *	end
+ *
+ * The result of calling +foo+ is this:
+ *
+ *	label: foo
+ *	label: block in foo
+ *	label: block (2 levels) in foo
  *
- *	loc = c(0..1).first
- *	loc.label #=> a
  */
 static VALUE
 location_label_m(VALUE self)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41362)
+++ ruby_2_0_0/version.h	(revision 41363)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-06-18"
-#define RUBY_PATCHLEVEL 223
+#define RUBY_PATCHLEVEL 224
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41348


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