diff options
author | nagachika <nagachika@ruby-lang.org> | 2020-06-27 12:20:36 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2020-06-27 12:20:36 +0900 |
commit | d8a32b146561a0ddd3e60da9863a082b7e7725db (patch) | |
tree | 696746bd7d753b1d644b464ecf1c27a399a265fc /parse.y | |
parent | 3c55d93cf68b1a969b90b306de4dd8b88d74a2f2 (diff) |
merge revision(s) 263b941321c3de6afc8f9dafbc2625f866b7437e: [Backport #16981]
[ripper] fix mismatched indentations warning [Bug #16981]
The scanner location has to be set from `lex.ptok` before it is
flushed by dispatching the scanner event.
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -9495,16 +9495,17 @@ yylex(YYSTYPE *lval, YYLTYPE *yylloc, struct parser_params *p) p->lval = lval; lval->val = Qundef; t = parser_yylex(p); - if (has_delayed_token(p)) - dispatch_delayed_token(p, t); - else if (t != 0) - dispatch_scan_event(p, t); if (p->lex.strterm && (p->lex.strterm->flags & STRTERM_HEREDOC)) RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*yylloc); else RUBY_SET_YYLLOC(*yylloc); + if (has_delayed_token(p)) + dispatch_delayed_token(p, t); + else if (t != 0) + dispatch_scan_event(p, t); + return t; } |