kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/strscan/strscan.c (strscan_aref): support named captures.

Browse source 
patched by Konstantin Haase [ruby-core:54664] [Feature #8343]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-05-21 13:48:57 +00:00
parent 9662e3ded5
commit ecd5bbe82a
3 changed files with 50 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue May 21 22:47:06 2013 NARUSE, Yui <naruse@ruby-lang.org>
* ext/strscan/strscan.c (strscan_aref): support named captures.
patched by Konstantin Haase [ruby-core:54664] [Feature #8343]
Tue May 21 21:48:44 2013 Kouhei Sutou <kou@cozmixng.org> Tue May 21 21:48:44 2013 Kouhei Sutou <kou@cozmixng.org>
* test/ruby/test_dir_m17n.rb (TestDir_M17N#test_entries_compose): * test/ruby/test_dir_m17n.rb (TestDir_M17N#test_entries_compose):

35
ext/strscan/strscan.c
View file

@ -38,6 +38,9 @@ struct strscanner
/* the regexp register; legal only when MATCHED_P(s) */ /* the regexp register; legal only when MATCHED_P(s) */
struct re_registers regs; struct re_registers regs;
/* regexp used for last scan */
VALUE regex;
}; };
#define MATCHED_P(s) ((s)->flags & FLAG_MATCHED) #define MATCHED_P(s) ((s)->flags & FLAG_MATCHED)
@ -456,6 +459,8 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
if (S_RESTLEN(p) < 0) { if (S_RESTLEN(p) < 0) {
return Qnil; return Qnil;
} }
p->regex = regex;
re = rb_reg_prepare_re(regex, p->str); re = rb_reg_prepare_re(regex, p->str);
tmpreg = re != RREGEXP(regex)->ptr; tmpreg = re != RREGEXP(regex)->ptr;
if (!tmpreg) RREGEXP(regex)->usecnt++; if (!tmpreg) RREGEXP(regex)->usecnt++;
@ -983,17 +988,45 @@ strscan_matched_size(VALUE self)
* s[3] # -> "12" * s[3] # -> "12"
* s.post_match # -> "1975 14:39" * s.post_match # -> "1975 14:39"
* s.pre_match # -> "" * s.pre_match # -> ""
*
* s.reset
* s.scan(/(?<wday>\w+) (?<month>\w+) (?<day>\d+) /) # -> "Fri Dec 12 "
* s[0] # -> "Fri Dec 12 "
* s[1] # -> "Fri"
* s[2] # -> "Dec"
* s[3] # -> "12"
* s[:wday] # -> "Fri"
* s[:month] # -> "Dec"
* s[:day] # -> "12"
* s.post_match # -> "1975 14:39"
* s.pre_match # -> ""
*/ */
static VALUE static VALUE
strscan_aref(VALUE self, VALUE idx) strscan_aref(VALUE self, VALUE idx)
{ {
const char *name, *name_end;
struct strscanner *p; struct strscanner *p;
long i; long i;
GET_SCANNER(self, p); GET_SCANNER(self, p);
if (! MATCHED_P(p)) return Qnil; if (! MATCHED_P(p)) return Qnil;
i = NUM2LONG(idx); switch (TYPE(idx)) {
case T_SYMBOL:
name = rb_id2name(SYM2ID(idx));
goto name_to_backref;
break;
case T_STRING:
name = StringValuePtr(idx);
name_to_backref:
name_end = name + strlen(name);
i = onig_name_to_backref_number(RREGEXP(p->regex)->ptr,
(const unsigned char* )name, (const unsigned char* )name_end, &(p->regs));
break;
default:
i = NUM2LONG(idx);
}
if (i < 0) if (i < 0)
i += p->regs.num_regs; i += p->regs.num_regs;
if (i < 0) return Qnil; if (i < 0) return Qnil;

11
test/strscan/test_stringscanner.rb
View file

@ -457,6 +457,17 @@ class TestStringScanner < Test::Unit::TestCase
assert_equal true, s[2].tainted? assert_equal true, s[2].tainted?
assert_equal true, s[3].tainted? assert_equal true, s[3].tainted?
assert_equal true, s[4].tainted? assert_equal true, s[4].tainted?
s = StringScanner.new("foo bar")
s.scan /(?<a>(\w+)) (?<b>(\w+))/
assert_equal 'foo', s[1]
assert_equal 'bar', s[2]
assert_equal 'foo', s[:a]
assert_equal 'bar', s[:b]
assert_equal nil, s[:c]
assert_equal 'foo', s['a']
assert_equal 'bar', s['b']
assert_equal nil, s['c']
end end
def test_pre_match def test_pre_match