From 83fa0928d735f7076a7b755ff150cdec741a32ed Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 17 Jul 2004 08:02:20 +0000 Subject: * string.c (rb_str_match_m): String#match should also take optional argument. [ruby-core:03205] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 8e7ebff2e9..63816fdaff 100644 --- a/string.c +++ b/string.c @@ -1266,7 +1266,9 @@ static VALUE get_pat _((VALUE, int)); * str.match(pattern) => matchdata or nil * * Converts pattern to a Regexp (if it isn't already one), - * then invokes its match method on str. + * then invokes its match method on str. 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" @@ -1275,10 +1277,17 @@ static VALUE get_pat _((VALUE, int)); */ static VALUE -rb_str_match_m(str, re) - VALUE str, re; +rb_str_match_m(argc, argv, str) + int argc; + VALUE *argv; + VALUE str; { - return rb_funcall(get_pat(re, 0), rb_intern("match"), 1, str); + VALUE re; + if (argc < 1) + rb_raise(rb_eArgError, "wrong number of arguments(%d for 1)", argc); + re = argv[0]; + argv[0] = str; + return rb_funcall2(get_pat(re, 0), rb_intern("match"), argc, argv); } static char @@ -4573,7 +4582,7 @@ Init_String() rb_define_method(rb_cString, "size", rb_str_length, 0); rb_define_method(rb_cString, "empty?", rb_str_empty, 0); rb_define_method(rb_cString, "=~", rb_str_match, 1); - rb_define_method(rb_cString, "match", rb_str_match_m, 1); + rb_define_method(rb_cString, "match", rb_str_match_m, -1); rb_define_method(rb_cString, "succ", rb_str_succ, 0); rb_define_method(rb_cString, "succ!", rb_str_succ_bang, 0); rb_define_method(rb_cString, "next", rb_str_succ, 0); -- cgit v1.2.3