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

ripper: Unify dispatch_end

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-06-11 10:50:19 +09:00
parent 1271ff72d5
commit 206465e84d
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
parse.y
View File

@ -9085,21 +9085,6 @@ set_number_literal(struct parser_params *p, enum yytokentype type, int suffix, i
return type; return type;
} }
#ifdef RIPPER
static void
dispatch_heredoc_end(struct parser_params *p)
{
VALUE str;
if (has_delayed_token(p))
dispatch_delayed_token(p, tSTRING_CONTENT);
str = STR_NEW(p->lex.ptok, p->lex.pend - p->lex.ptok);
ripper_dispatch1(p, ripper_token2eventid(tHEREDOC_END), str);
RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*p->yylloc);
lex_goto_eol(p);
token_flush(p);
}
#else
#define dispatch_heredoc_end(p) parser_dispatch_heredoc_end(p, __LINE__) #define dispatch_heredoc_end(p) parser_dispatch_heredoc_end(p, __LINE__)
static void static void
parser_dispatch_heredoc_end(struct parser_params *p, int line) parser_dispatch_heredoc_end(struct parser_params *p, int line)
@ -9107,17 +9092,21 @@ parser_dispatch_heredoc_end(struct parser_params *p, int line)
if (has_delayed_token(p)) if (has_delayed_token(p))
dispatch_delayed_token(p, tSTRING_CONTENT); dispatch_delayed_token(p, tSTRING_CONTENT);
#ifdef RIPPER
VALUE str = STR_NEW(p->lex.ptok, p->lex.pend - p->lex.ptok);
ripper_dispatch1(p, ripper_token2eventid(tHEREDOC_END), str);
#else
if (p->keep_tokens) { if (p->keep_tokens) {
rb_parser_string_t *str = rb_parser_encoding_string_new(p, p->lex.ptok, p->lex.pend - p->lex.ptok, p->enc); rb_parser_string_t *str = rb_parser_encoding_string_new(p, p->lex.ptok, p->lex.pend - p->lex.ptok, p->enc);
RUBY_SET_YYLLOC_OF_HEREDOC_END(*p->yylloc); RUBY_SET_YYLLOC_OF_HEREDOC_END(*p->yylloc);
parser_append_tokens(p, str, tHEREDOC_END, line); parser_append_tokens(p, str, tHEREDOC_END, line);
} }
#endif
RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*p->yylloc); RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*p->yylloc);
lex_goto_eol(p); lex_goto_eol(p);
token_flush(p); token_flush(p);
} }
#endif
static enum yytokentype static enum yytokentype
here_document(struct parser_params *p, rb_strterm_heredoc_t *here) here_document(struct parser_params *p, rb_strterm_heredoc_t *here)