summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--vm_eval.c15
2 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 3db237093d..c1fc483b19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 25 01:46:49 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_eval.c (rb_f_caller): update rdoc. a patch from Nobuhiro IMAI
+ <nov at yo.rim.or.jp> in [ruby-dev:41387].
+
Mon May 24 23:04:41 2010 Tanaka Akira <akr@fsij.org>
* error.c: fix wrong exception class name in rdoc.
diff --git a/vm_eval.c b/vm_eval.c
index cff05a0c3f..e609ca0e0b 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1536,7 +1536,7 @@ rb_catch_obj(VALUE tag, VALUE (*func)(), VALUE data)
/*
* call-seq:
- * caller(start=1) -> Array or nil
+ * caller(start=1) -> array or nil
*
* Returns the current execution stack---an array containing strings in
* the form ``<em>file:line</em>'' or ``<em>file:line: in
@@ -1544,7 +1544,7 @@ rb_catch_obj(VALUE tag, VALUE (*func)(), VALUE data)
* determines the number of initial stack entries to omit from the
* result.
*
- * Returns +nil+ if _start_ is greater than or equal to the size of
+ * Returns +nil+ if _start_ is greater than the size of
* current execution stack.
*
* def a(skip)
@@ -1556,11 +1556,12 @@ rb_catch_obj(VALUE tag, VALUE (*func)(), VALUE data)
* def c(skip)
* b(skip)
* end
- * c(0) #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10"]
- * c(1) #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11"]
- * c(2) #=> ["prog:8:in `c'", "prog:12"]
- * c(3) #=> ["prog:13"]
- * c(4) #=> nil
+ * c(0) #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10:in `<main>'"]
+ * c(1) #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11:in `<main>'"]
+ * c(2) #=> ["prog:8:in `c'", "prog:12:in `<main>'"]
+ * c(3) #=> ["prog:13:in `<main>'"]
+ * c(4) #=> []
+ * c(5) #=> nil
*/
static VALUE