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

re.c: NAME_TO_NUMBER

Browse source 
* re.c (namev_to_backref_number, rb_reg_regsub): extract name to
  backref number check as NAME_TO_NUMBER.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-19 03:11:57 +00:00
parent 1b45e53349
commit db29a279fc
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
re.c
View file

@ -1829,6 +1829,11 @@ name_to_backref_error(VALUE name)
name);
}
#define NAME_TO_NUMBER(regs, re, name, name_ptr, name_end) \
(NIL_P(re) ? 0 : \
!rb_enc_compatible(RREGEXP_SRC(re), (name)) ? 0 : \
name_to_backref_number((regs), (re), (name_ptr), (name_end)))
static int
namev_to_backref_number(struct re_registers *regs, VALUE re, VALUE name)
{
@ -1839,9 +1844,9 @@ namev_to_backref_number(struct re_registers *regs, VALUE re, VALUE name)
name = rb_sym2str(name);
/* fall through */
case T_STRING:
if (NIL_P(re) || !rb_enc_compatible(RREGEXP_SRC(re), name) ||
(num = name_to_backref_number(regs, re,
RSTRING_PTR(name), RSTRING_END(name))) < 1) {
num = NAME_TO_NUMBER(regs, re, name,
RSTRING_PTR(name), RSTRING_END(name));
if (num < 1) {
name_to_backref_error(name);
}
return num;
@ -3730,9 +3735,7 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
if (name_end < e) {
VALUE n = rb_str_subseq(str, (long)(name - RSTRING_PTR(str)),
(long)(name_end - name));
if (NIL_P(regexp) ||
!rb_enc_compatible(RREGEXP_SRC(regexp), n) ||
(no = name_to_backref_number(regs, regexp, name, name_end)) < 1) {
if ((no = NAME_TO_NUMBER(regs, regexp, n, name, name_end)) < 1) {
name_to_backref_error(n);
}
p = s = name_end + clen;