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

[ruby/prism] Handle regexp split between heredocs

Browse Source 
https://github.com/ruby/prism/commit/c1400d8aed
This commit is contained in:
Kevin Newton 2024-03-26 09:33:03 -04:00
parent 240fb3957b
commit 2a3601d64e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
prism/prism.c
View File

@ -4345,10 +4345,10 @@ pm_interpolated_string_node_append(pm_parser_t *parser, pm_interpolated_string_n
if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) { if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) {
switch (parser->frozen_string_literal) { switch (parser->frozen_string_literal) {
case PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED: case PM_OPTIONS_FROZEN_STRING_LITERAL_DISABLED:
pm_node_flag_set((pm_node_t *) node, PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN); pm_node_flag_set((pm_node_t *) node, PM_INTERPOLATED_STRING_NODE_FLAGS_MUTABLE);
break; break;
case PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED: case PM_OPTIONS_FROZEN_STRING_LITERAL_ENABLED:
pm_node_flag_set((pm_node_t *) node, PM_INTERPOLATED_STRING_NODE_FLAGS_MUTABLE); pm_node_flag_set((pm_node_t *) node, PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN);
break; break;
} }
} }
@ -10900,11 +10900,15 @@ parser_lex(pm_parser_t *parser) {
// the list of newlines. // the list of newlines.
if (parser->heredoc_end == NULL) { if (parser->heredoc_end == NULL) {
pm_newline_list_append(&parser->newline_list, breakpoint); pm_newline_list_append(&parser->newline_list, breakpoint);
parser->current.end = breakpoint + 1;
breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false);
break;
} }
parser->current.end = breakpoint + 1; parser->current.end = breakpoint + 1;
breakpoint = pm_strpbrk(parser, parser->current.end, breakpoints, parser->end - parser->current.end, false); parser_flush_heredoc_end(parser);
break; pm_regexp_token_buffer_flush(parser, &token_buffer);
LEX(PM_TOKEN_STRING_CONTENT);
case '\\': { case '\\': {
// If we hit escapes, then we need to treat the next // If we hit escapes, then we need to treat the next
// token literally. In this case we'll skip past the // token literally. In this case we'll skip past the