From ca3c007f058f17b2f0bf3c5ccc6701f3f6d49ca5 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 6 May 2010 06:07:05 +0000 Subject: * string.c (rb_str_match_m): add description about optional position parameter. [ruby-list:47064] patched by KISHIMOTO, Makoto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ string.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5694d4c971..e1213563ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu May 6 15:04:37 2010 NARUSE, Yui + + * string.c (rb_str_match_m): add description about optional + position parameter. [ruby-list:47064] + patched by KISHIMOTO, Makoto + Thu May 6 14:12:39 2010 Tanaka Akira * lib/tmpdir.rb: test RUBY_PLATFORM for loading tmpdir.so to avoid diff --git a/string.c b/string.c index caca178fc4..ca27db6963 100644 --- a/string.c +++ b/string.c @@ -2555,12 +2555,15 @@ static VALUE get_pat(VALUE, int); /* * call-seq: - * str.match(pattern) => matchdata or nil + * str.match(pattern) => matchdata or nil + * str.match(pattern, pos) => matchdata or nil * * Converts pattern to a Regexp (if it isn't already one), * then invokes its match method on str. If the second * parameter is present, it specifies the position in the string to begin the * search. + * If the second parameter is present, it specifies the position in the string + * to begin the search. * * 'hello'.match('(.)\1') #=> # * 'hello'.match('(.)\1')[0] #=> "ll" @@ -2586,7 +2589,7 @@ rb_str_match_m(int argc, VALUE *argv, VALUE str) { VALUE re, result; if (argc < 1) - rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc); + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc); re = argv[0]; argv[0] = str; result = rb_funcall2(get_pat(re, 0), rb_intern("match"), argc, argv); -- cgit v1.2.3