diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-12 14:36:02 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-12 14:36:02 +0000 |
commit | a6ea67016c708424d53ef02cd738d89563cd3646 (patch) | |
tree | 8a085abddef87bf6be93b31b207098280d5cef57 /re.c | |
parent | 7adaab39daa5c34f6da0dfa5029fb0177a1ae62e (diff) |
* re.c (match_values_at): make #select to be alias to #values_at
to adapt RDoc description. [ruby-core:12588]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 46 |
1 files changed, 4 insertions, 42 deletions
@@ -1217,14 +1217,15 @@ match_entry(match, n) /* * call-seq: - * mtch.select([index]*) => array + * mtch.values_at([index]*) => array + * mtch.select([index]*) => array * * Uses each <i>index</i> to access the matching values, returning an array of * the corresponding matches. * * m = /(.)(.)(\d+)(\d)/.match("THX1138: The Movie") * m.to_a #=> ["HX1138", "H", "X", "113", "8"] - * m.select(0, 2, -2) #=> ["HX1138", "X", "113"] + * m.values_at(0, 2, -2) #=> ["HX1138", "X", "113"] */ static VALUE @@ -1237,45 +1238,6 @@ match_values_at(argc, argv, match) } -/* - * call-seq: - * mtch.select([index]*) => array - * - * Uses each <i>index</i> to access the matching values, returning an - * array of the corresponding matches. - * - * m = /(.)(.)(\d+)(\d)/.match("THX1138: The Movie") - * m.to_a #=> ["HX1138", "H", "X", "113", "8"] - * m.select(0, 2, -2) #=> ["HX1138", "X", "113"] - */ - -static VALUE -match_select(argc, argv, match) - int argc; - VALUE *argv; - VALUE match; -{ - if (argc > 0) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc); - } - else { - struct re_registers *regs = RMATCH(match)->regs; - VALUE target = RMATCH(match)->str; - VALUE result = rb_ary_new(); - int i; - int taint = OBJ_TAINTED(match); - - for (i=0; i<regs->num_regs; i++) { - VALUE str = rb_str_substr(target, regs->beg[i], regs->end[i]-regs->beg[i]); - if (taint) OBJ_TAINT(str); - if (RTEST(rb_yield(str))) { - rb_ary_push(result, str); - } - } - return result; - } -} - /* * call-seq: @@ -2313,8 +2275,8 @@ Init_Regexp() rb_define_method(rb_cMatch, "to_a", match_to_a, 0); rb_define_method(rb_cMatch, "[]", match_aref, -1); rb_define_method(rb_cMatch, "captures", match_captures, 0); - rb_define_method(rb_cMatch, "select", match_select, -1); rb_define_method(rb_cMatch, "values_at", match_values_at, -1); + rb_define_method(rb_cMatch, "select", match_values_at, -1); rb_define_method(rb_cMatch, "pre_match", rb_reg_match_pre, 0); rb_define_method(rb_cMatch, "post_match", rb_reg_match_post, 0); rb_define_method(rb_cMatch, "to_s", match_to_s, 0); |