archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 41348:

Browse source 
* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-06-17 15:43:58 +00:00
parent e4fd9de96d
commit c03f37d609
3 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Jun 18 00:43:27 2013 Zachary Scott <zachary@zacharyscott.net>
* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1
Tue Jun 18 00:34:57 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> Tue Jun 18 00:34:57 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
merge revision(s) 41347: [Backport #5048] [Backport #5465] [Backport #8319] merge revision(s) 41347: [Backport #5048] [Backport #5465] [Backport #8319]

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-18" #define RUBY_RELEASE_DATE "2013-06-18"
#define RUBY_PATCHLEVEL 223 #define RUBY_PATCHLEVEL 224
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6

23
vm_backtrace.c
View file

@ -177,10 +177,27 @@ location_label(rb_backtrace_location_t *loc)
* *
* Usually consists of method, class, module, etc names with decoration. * 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 static VALUE
location_label_m(VALUE self) location_label_m(VALUE self)