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

Use rb_reg_nth_defined instead of rb_match_nth_defined

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-06-27 22:39:15 +09:00
parent eaad44adb2
commit df5ae0a550
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2023-06-27 15:27:56 +00:00 
Merged: https://github.com/ruby/ruby/pull/7983
4 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/ruby/internal/intern/re.h
View File

@ -87,11 +87,6 @@ void rb_match_busy(VALUE md);
* @retval RUBY_Qfalse There is a `n`-th capture and is empty. * @retval RUBY_Qfalse There is a `n`-th capture and is empty.
* @retval RUBY_Qtrue There is a `n`-th capture that has something. * @retval RUBY_Qtrue There is a `n`-th capture that has something.
* *
* @internal
*
* @shyouhei wonders: why there are both rb_reg_match_defined() and
* rb_match_nth_defined, which are largely the same things, but do not share
* their implementations at all?
*/ */
VALUE rb_reg_nth_defined(int n, VALUE md); VALUE rb_reg_nth_defined(int n, VALUE md);

1
internal/re.h
View File

@ -22,7 +22,6 @@ VALUE rb_reg_equal(VALUE re1, VALUE re2);
void rb_backref_set_string(VALUE string, long pos, long len); void rb_backref_set_string(VALUE string, long pos, long len);
void rb_match_unbusy(VALUE); void rb_match_unbusy(VALUE);
int rb_match_count(VALUE match); int rb_match_count(VALUE match);
int rb_match_nth_defined(int nth, VALUE match);
VALUE rb_reg_new_ary(VALUE ary, int options); VALUE rb_reg_new_ary(VALUE ary, int options);
#endif /* INTERNAL_RE_H */ #endif /* INTERNAL_RE_H */

17
re.c
View File

@ -1450,23 +1450,6 @@ rb_match_count(VALUE match)
return regs->num_regs; return regs->num_regs;
} }
int
rb_match_nth_defined(int nth, VALUE match)
{
struct re_registers *regs;
if (NIL_P(match)) return FALSE;
regs = RMATCH_REGS(match);
if (!regs) return FALSE;
if (nth >= regs->num_regs) {
return FALSE;
}
if (nth < 0) {
nth += regs->num_regs;
if (nth <= 0) return FALSE;
}
return (BEG(nth) != -1);
}
static void static void
match_set_string(VALUE m, VALUE string, long pos, long len) match_set_string(VALUE m, VALUE string, long pos, long len)
{ {

2
variable.c
View File

@ -902,7 +902,7 @@ rb_f_global_variables(void)
int i, nmatch = rb_match_count(backref); int i, nmatch = rb_match_count(backref);
buf[0] = '$'; buf[0] = '$';
for (i = 1; i <= nmatch; ++i) { for (i = 1; i <= nmatch; ++i) {
if (!rb_match_nth_defined(i, backref)) continue; if (!RTEST(rb_reg_nth_defined(i, backref))) continue;
if (i < 10) { if (i < 10) {
/* probably reused, make static ID */ /* probably reused, make static ID */
buf[1] = (char)(i + '0'); buf[1] = (char)(i + '0');