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

Refactor reg_extract_args to return regexp if given

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-12-22 15:59:31 +09:00
parent 78826ad486
commit e61e4ae60b
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
re.c
View File

@ -3751,12 +3751,13 @@ set_timeout(rb_hrtime_t *hrt, VALUE timeout)
} }
struct reg_init_args { struct reg_init_args {
VALUE src, str, timeout; VALUE str;
VALUE timeout;
rb_encoding *enc; rb_encoding *enc;
int flags; int flags;
}; };
static void reg_extract_args(int argc, VALUE *argv, struct reg_init_args *args); static VALUE reg_extract_args(int argc, VALUE *argv, struct reg_init_args *args);
static VALUE reg_init_args(VALUE self, VALUE str, rb_encoding *enc, int flags); static VALUE reg_init_args(VALUE self, VALUE str, rb_encoding *enc, int flags);
/* /*
@ -3832,12 +3833,13 @@ rb_reg_initialize_m(int argc, VALUE *argv, VALUE self)
return self; return self;
} }
static void static VALUE
reg_extract_args(int argc, VALUE *argv, struct reg_init_args *args) reg_extract_args(int argc, VALUE *argv, struct reg_init_args *args)
{ {
int flags = 0; int flags = 0;
rb_encoding *enc = 0; rb_encoding *enc = 0;
VALUE str, src, opts = Qundef, n_flag = Qundef, kwargs; VALUE str, src, opts = Qundef, n_flag = Qundef, kwargs;
VALUE re = Qnil;
rb_scan_args(argc, argv, "12:", &src, &opts, &n_flag, &kwargs); rb_scan_args(argc, argv, "12:", &src, &opts, &n_flag, &kwargs);
@ -3851,7 +3853,7 @@ reg_extract_args(int argc, VALUE *argv, struct reg_init_args *args)
} }
if (RB_TYPE_P(src, T_REGEXP)) { if (RB_TYPE_P(src, T_REGEXP)) {
VALUE re = src; re = src;
if (!NIL_P(opts)) { if (!NIL_P(opts)) {
rb_warn("flags ignored"); rb_warn("flags ignored");
@ -3880,10 +3882,10 @@ reg_extract_args(int argc, VALUE *argv, struct reg_init_args *args)
} }
str = StringValue(src); str = StringValue(src);
} }
args->src = src;
args->str = str; args->str = str;
args->enc = enc; args->enc = enc;
args->flags = flags; args->flags = flags;
return re;
} }
static VALUE static VALUE
@ -4243,15 +4245,10 @@ rb_reg_s_union_m(VALUE self, VALUE args)
static VALUE static VALUE
rb_reg_s_linear_time_p(int argc, VALUE *argv, VALUE self) rb_reg_s_linear_time_p(int argc, VALUE *argv, VALUE self)
{ {
VALUE re;
struct reg_init_args args; struct reg_init_args args;
VALUE re = reg_extract_args(argc, argv, &args);
reg_extract_args(argc, argv, &args); if (NIL_P(re)) {
if (RB_TYPE_P(args.src, T_REGEXP)) {
re = args.src;
}
else {
re = reg_init_args(rb_reg_alloc(), args.str, args.enc, args.flags); re = reg_init_args(rb_reg_alloc(), args.str, args.enc, args.flags);
} }