aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--vm_backtrace.c23
2 files changed, 24 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c8e5a6929..db045578b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 17 14:27:54 2013 Zachary Scott <zachary@zacharyscott.net>
+
+ * vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1
+
Mon Jun 17 13:04:01 2013 Akinori MUSHA <knu@iDaemons.org>
* tool/ifchange (until): Fix the condition, although harmless in
diff --git a/vm_backtrace.c b/vm_backtrace.c
index 1cc0d07f12..3287c1f950 100644
--- a/vm_backtrace.c
+++ b/vm_backtrace.c
@@ -177,10 +177,27 @@ location_label(rb_backtrace_location_t *loc)
*
* 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)