kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ripper] fix mismatched indentations warning [Bug #16981]

Browse source 
The scanner location has to be set from `lex.ptok` before it is
flushed by dispatching the scanner event.
This commit is contained in:
Nobuyoshi Nakada 2020-06-24 19:53:14 +09:00
parent 7f29e34f35
commit 263b941321
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
parse.y
View file

@ -9662,16 +9662,17 @@ yylex(YYSTYPE *lval, YYLTYPE *yylloc, struct parser_params *p)
p->lval = lval; p->lval = lval;
lval->val = Qundef; lval->val = Qundef;
t = parser_yylex(p); 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)) if (p->lex.strterm && (p->lex.strterm->flags & STRTERM_HEREDOC))
RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*yylloc); RUBY_SET_YYLLOC_FROM_STRTERM_HEREDOC(*yylloc);
else else
RUBY_SET_YYLLOC(*yylloc); 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; return t;
} }

6
test/ripper/test_parser_events.rb
View file

@ -1538,6 +1538,12 @@ class TestRipper::ParserEvents < Test::Unit::TestCase
assert_match(/encountered/, fmt) assert_match(/encountered/, fmt)
end end
def test_warn_mismatched_indentations
fmt, tokend, tokbeg, line = assert_warning("") {break warn("if true\n end\n")}
assert_match(/mismatched indentations/, fmt)
assert_equal(["if", "end", 1], [tokbeg, tokend, line])
end
def test_in def test_in
thru_in = false thru_in = false
parse('case 0; in 0; end', :on_in) {thru_in = true} parse('case 0; in 0; end', :on_in) {thru_in = true}