mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* re.c (match_array): replace match_check().
* re.c (match_values_at): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3f59f0e06c
commit
1c400db1d5
2 changed files with 16 additions and 4 deletions
|
@ -3,6 +3,12 @@ Tue Feb 3 14:12:10 2009 Shugo Maeda <shugo@ruby-lang.org>
|
||||||
* lib/net/imap.rb: validate data before sending to a server.
|
* lib/net/imap.rb: validate data before sending to a server.
|
||||||
[ruby-core:20320]
|
[ruby-core:20320]
|
||||||
|
|
||||||
|
Tue Feb 3 12:35:41 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* re.c (match_array): replace match_check().
|
||||||
|
|
||||||
|
* re.c (match_values_at): ditto.
|
||||||
|
|
||||||
Tue Feb 3 12:09:08 2009 Shugo Maeda <shugo@ruby-lang.org>
|
Tue Feb 3 12:09:08 2009 Shugo Maeda <shugo@ruby-lang.org>
|
||||||
|
|
||||||
* lib/net/imap.rb (hmac_md5): should use String#ord to get ascii
|
* lib/net/imap.rb (hmac_md5): should use String#ord to get ascii
|
||||||
|
|
14
re.c
14
re.c
|
@ -1518,13 +1518,17 @@ last_paren_match_getter(void)
|
||||||
static VALUE
|
static VALUE
|
||||||
match_array(VALUE match, int start)
|
match_array(VALUE match, int start)
|
||||||
{
|
{
|
||||||
struct re_registers *regs = RMATCH_REGS(match);
|
struct re_registers *regs;
|
||||||
VALUE ary = rb_ary_new2(regs->num_regs);
|
VALUE ary;
|
||||||
VALUE target = RMATCH(match)->str;
|
VALUE target;
|
||||||
int i;
|
int i;
|
||||||
int taint = OBJ_TAINTED(match);
|
int taint = OBJ_TAINTED(match);
|
||||||
|
|
||||||
match_check(match);
|
match_check(match);
|
||||||
|
regs = RMATCH_REGS(match);
|
||||||
|
ary = rb_ary_new2(regs->num_regs);
|
||||||
|
target = RMATCH(match)->str;
|
||||||
|
|
||||||
for (i=start; i<regs->num_regs; i++) {
|
for (i=start; i<regs->num_regs; i++) {
|
||||||
if (regs->beg[i] == -1) {
|
if (regs->beg[i] == -1) {
|
||||||
rb_ary_push(ary, Qnil);
|
rb_ary_push(ary, Qnil);
|
||||||
|
@ -1697,8 +1701,10 @@ match_entry(VALUE match, long n)
|
||||||
static VALUE
|
static VALUE
|
||||||
match_values_at(int argc, VALUE *argv, VALUE match)
|
match_values_at(int argc, VALUE *argv, VALUE match)
|
||||||
{
|
{
|
||||||
struct re_registers *regs = RMATCH_REGS(match);
|
struct re_registers *regs;
|
||||||
|
|
||||||
match_check(match);
|
match_check(match);
|
||||||
|
regs = RMATCH_REGS(match);
|
||||||
return rb_get_values_at(match, regs->num_regs, argc, argv, match_entry);
|
return rb_get_values_at(match, regs->num_regs, argc, argv, match_entry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue