Skip to content

Commit d6046bc

Browse files
nobuhsbt
authored andcommitted
[ruby/strscan] Use C90 as far as supporting 2.6 or earlier
(ruby/strscan#101) ruby/strscan@d31274f41b
1 parent e7f0640 commit d6046bc

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

ext/strscan/strscan.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -626,12 +626,13 @@ rb_reg_onig_match(VALUE re, VALUE str,
626626
OnigPosition (*match)(regex_t *reg, VALUE str, struct re_registers *regs, void *args),
627627
void *args, struct re_registers *regs)
628628
{
629+
OnigPosition result;
629630
regex_t *reg = rb_reg_prepare_re(re, str);
630631

631632
bool tmpreg = reg != RREGEXP_PTR(re);
632633
if (!tmpreg) RREGEXP(re)->usecnt++;
633634

634-
OnigPosition result = match(reg, str, regs, args);
635+
result = match(reg, str, regs, args);
635636

636637
if (!tmpreg) RREGEXP(re)->usecnt--;
637638
if (tmpreg) {
@@ -694,12 +695,13 @@ strscan_do_scan(VALUE self, VALUE pattern, int succptr, int getstr, int headonly
694695
}
695696

696697
if (RB_TYPE_P(pattern, T_REGEXP)) {
698+
OnigPosition ret;
697699
p->regex = pattern;
698-
OnigPosition ret = rb_reg_onig_match(pattern,
699-
p->str,
700-
headonly ? strscan_match : strscan_search,
701-
(void *)p,
702-
&(p->regs));
700+
ret = rb_reg_onig_match(p->regex,
701+
p->str,
702+
headonly ? strscan_match : strscan_search,
703+
(void *)p,
704+
&(p->regs));
703705

704706
if (ret == ONIG_MISMATCH) {
705707
return Qnil;
@@ -1139,13 +1141,14 @@ static VALUE
11391141
strscan_scan_byte(VALUE self)
11401142
{
11411143
struct strscanner *p;
1144+
VALUE byte;
11421145

11431146
GET_SCANNER(self, p);
11441147
CLEAR_MATCH_STATUS(p);
11451148
if (EOS_P(p))
11461149
return Qnil;
11471150

1148-
VALUE byte = INT2FIX((unsigned char)*CURPTR(p));
1151+
byte = INT2FIX((unsigned char)*CURPTR(p));
11491152
p->prev = p->curr;
11501153
p->curr++;
11511154
MATCHED(p);
@@ -2114,8 +2117,8 @@ static VALUE
21142117
strscan_named_captures(VALUE self)
21152118
{
21162119
struct strscanner *p;
2117-
GET_SCANNER(self, p);
21182120
named_captures_data data;
2121+
GET_SCANNER(self, p);
21192122
data.self = self;
21202123
data.captures = rb_hash_new();
21212124
if (!RB_NIL_P(p->regex)) {

0 commit comments

Comments
 (0)