summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-06-24 19:53:14 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-06-24 19:53:14 +0900
commit263b941321c3de6afc8f9dafbc2625f866b7437e (patch)
tree7848e0ede150a7577b3ea3e9b10a3775b44885f3 /parse.y
parent7f29e34f35d63f0eda0f9adec12d5ec766c1b1b1 (diff)
[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.y9
1 files changed, 5 insertions, 4 deletions
diff --git a/parse.y b/parse.y
index c09c9f9750..3a95252c58 100644
--- a/parse.y
+++ b/parse.y
@@ -9662,16 +9662,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;
}