1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract backref_number_check

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2021-09-11 22:50:59 +09:00
parent 99d8c4832a
commit c5570a7c11
Notes: git 2021-09-12 11:17:11 +09:00 
Merged: https://github.com/ruby/ruby/pull/4822
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
re.c
View File

@ -1159,6 +1159,13 @@ name_to_backref_error(VALUE name)
name); name);
} }
static void
backref_number_check(struct re_registers *regs, int i)
{
if (i < 0 || regs->num_regs <= i)
rb_raise(rb_eIndexError, "index %d out of matches", i);
}
static int static int
match_backref_number(VALUE match, VALUE backref) match_backref_number(VALUE match, VALUE backref)
{ {
@ -1217,8 +1224,7 @@ match_offset(VALUE match, VALUE n)
struct re_registers *regs = RMATCH_REGS(match); struct re_registers *regs = RMATCH_REGS(match);
match_check(match); match_check(match);
if (i < 0 || regs->num_regs <= i) backref_number_check(regs, i);
rb_raise(rb_eIndexError, "index %d out of matches", i);
if (BEG(i) < 0) if (BEG(i) < 0)
return rb_assoc_new(Qnil, Qnil); return rb_assoc_new(Qnil, Qnil);
@ -1253,8 +1259,7 @@ match_begin(VALUE match, VALUE n)
struct re_registers *regs = RMATCH_REGS(match); struct re_registers *regs = RMATCH_REGS(match);
match_check(match); match_check(match);
if (i < 0 || regs->num_regs <= i) backref_number_check(regs, i);
rb_raise(rb_eIndexError, "index %d out of matches", i);
if (BEG(i) < 0) if (BEG(i) < 0)
return Qnil; return Qnil;
@ -1288,8 +1293,7 @@ match_end(VALUE match, VALUE n)
struct re_registers *regs = RMATCH_REGS(match); struct re_registers *regs = RMATCH_REGS(match);
match_check(match); match_check(match);
if (i < 0 || regs->num_regs <= i) backref_number_check(regs, i);
rb_raise(rb_eIndexError, "index %d out of matches", i);
if (BEG(i) < 0) if (BEG(i) < 0)
return Qnil; return Qnil;