archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Bug #20969] Pass assignable from ripper

Browse source 
For the universal parser, `rb_reg_named_capture_assign_iter_impl`
function is shared between the parser and ripper.  However
`parser_params` struct is partially different, and `assignable`
function depends on that part indirectly.
This commit is contained in:
Nobuyoshi Nakada 2024-12-19 23:20:09 +09:00
parent a58675386c
commit 7b2ae8df90
No known key found for this signature in database
GPG key ID: 3582D74E1FEE4465
Notes: git 2024-12-19 15:08:23 +00:00
5 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ruby_parser.c
View file

@ -197,6 +197,7 @@ typedef struct {
rb_encoding *enc;
NODE *succ_block;
const rb_code_location_t *loc;
rb_parser_assignable_func assignable;
} reg_named_capture_assign_t;
static int
@ -210,11 +211,12 @@ reg_named_capture_assign_iter(const OnigUChar *name, const OnigUChar *name_end,
long len = name_end - name;
const char *s = (const char *)name;
return rb_reg_named_capture_assign_iter_impl(p, s, len, enc, &arg->succ_block, loc);
return rb_reg_named_capture_assign_iter_impl(p, s, len, enc, &arg->succ_block, loc, arg->assignable);
}
static NODE *
reg_named_capture_assign(struct parser_params* p, VALUE regexp, const rb_code_location_t *loc)
reg_named_capture_assign(struct parser_params* p, VALUE regexp, const rb_code_location_t *loc,
rb_parser_assignable_func assignable)
{
reg_named_capture_assign_t arg;
@ -222,6 +224,7 @@ reg_named_capture_assign(struct parser_params* p, VALUE regexp, const rb_code_lo
arg.enc = rb_enc_get(regexp);
arg.succ_block = 0;
arg.loc = loc;
arg.assignable = assignable;
onig_foreach_name(RREGEXP_PTR(regexp), reg_named_capture_assign_iter, &arg);
if (!arg.succ_block) return 0;