admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mruby-regexp: consolidate MatchData#captures and #to_a

Browse Source 
Both methods had identical loop bodies, differing only in the
starting group index (1 vs 0). Extracted matchdata_to_ary()
with a from parameter.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2026-03-23 09:37:01 +09:00
parent 2ef3a7c21e
commit 1f0809aad3
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-regexp/src/regexp.c
+15 -28
View File
@@ -455,50 +455,37 @@ found:
return mrb_str_substr(mrb, md->source, start, end - start);
}
/*
* MatchData#captures
*/
/* Build array of capture strings from group `from` to num_captures-1 */
static mrb_value
matchdata_captures(mrb_state *mrb, mrb_value self)
matchdata_to_ary(mrb_state *mrb, mrb_value self, int from)
{
mrb_match_data *md = DATA_GET_PTR(mrb, self, &matchdata_type, mrb_match_data);
if (!md) return mrb_ary_new(mrb);
mrb_value ary = mrb_ary_new_capa(mrb, md->num_captures - 1);
for (int i = 1; i < md->num_captures; i++) {
int start = md->captures[i * 2];
int end = md->captures[i * 2 + 1];
if (start < 0) {
mrb_value ary = mrb_ary_new_capa(mrb, md->num_captures - from);
for (int i = from; i < md->num_captures; i++) {
int s = md->captures[i * 2];
int e = md->captures[i * 2 + 1];
if (s < 0) {
mrb_ary_push(mrb, ary, mrb_nil_value());
}
else {
mrb_ary_push(mrb, ary, mrb_str_substr(mrb, md->source, start, end - start));
mrb_ary_push(mrb, ary, mrb_str_substr(mrb, md->source, s, e - s));
}
}
return ary;
}
/*
* MatchData#to_a
*/
static mrb_value
matchdata_captures(mrb_state *mrb, mrb_value self)
{
return matchdata_to_ary(mrb, self, 1);
}
static mrb_value
matchdata_to_a(mrb_state *mrb, mrb_value self)
{
mrb_match_data *md = DATA_GET_PTR(mrb, self, &matchdata_type, mrb_match_data);
if (!md) return mrb_ary_new(mrb);
mrb_value ary = mrb_ary_new_capa(mrb, md->num_captures);
for (int i = 0; i < md->num_captures; i++) {
int start = md->captures[i * 2];
int end = md->captures[i * 2 + 1];
if (start < 0) {
mrb_ary_push(mrb, ary, mrb_nil_value());
}
else {
mrb_ary_push(mrb, ary, mrb_str_substr(mrb, md->source, start, end - start));
}
}
return ary;
return matchdata_to_ary(mrb, self, 0);
}
/*