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

Check indent of end against else if present

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-07-08 17:09:59 +09:00
parent e0a3c547dd
commit 995ae6d529
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
parse.y
View File

@ -905,6 +905,7 @@ PRINTF_ARGS(static void parser_compile_error(struct parser_params*, const char *
# define compile_error parser_compile_error # define compile_error parser_compile_error
#endif #endif
static void token_info_setup(token_info *ptinfo, const char *ptr, const rb_code_location_t *loc);
static void token_info_push(struct parser_params*, const char *token, const rb_code_location_t *loc); static void token_info_push(struct parser_params*, const char *token, const rb_code_location_t *loc);
static void token_info_pop(struct parser_params*, const char *token, const rb_code_location_t *loc); static void token_info_pop(struct parser_params*, const char *token, const rb_code_location_t *loc);
static void token_info_warn(struct parser_params *p, const char *token, token_info *ptinfo_beg, int same, const rb_code_location_t *loc); static void token_info_warn(struct parser_params *p, const char *token, token_info *ptinfo_beg, int same, const rb_code_location_t *loc);
@ -3004,11 +3005,12 @@ k_if : keyword_if
{ {
token_info_push(p, "if", &@$); token_info_push(p, "if", &@$);
if (p->token_info && p->token_info->nonspc && if (p->token_info && p->token_info->nonspc &&
p->token_info->next && !strcmp(p->token_info->next->token, "if")) { p->token_info->next && !strcmp(p->token_info->next->token, "else")) {
const char *tok = p->lex.ptok, *beg = p->lex.pbeg; const char *tok = p->lex.ptok;
while (tok > beg && ISSPACE(*--tok)); const char *beg = p->lex.pbeg + p->token_info->next->beg.column;
beg += rb_strlen_lit("else");
while (beg < tok && ISSPACE(*beg)) beg++; while (beg < tok && ISSPACE(*beg)) beg++;
if (tok - beg == 3 && !memcmp(beg, "else", 4)) { if (beg == tok) {
p->token_info->nonspc = 0; p->token_info->nonspc = 0;
} }
} }
@ -3098,6 +3100,13 @@ k_else : keyword_else
token_info *ptinfo_beg = p->token_info; token_info *ptinfo_beg = p->token_info;
int same = ptinfo_beg && strcmp(ptinfo_beg->token, "case") != 0; int same = ptinfo_beg && strcmp(ptinfo_beg->token, "case") != 0;
token_info_warn(p, "else", p->token_info, same, &@$); token_info_warn(p, "else", p->token_info, same, &@$);
if (same) {
token_info e;
e.next = ptinfo_beg->next;
e.token = "else";
token_info_setup(&e, p->lex.pbeg, &@$);
if (!e.nonspc) *ptinfo_beg = e;
}
} }
; ;
@ -5383,7 +5392,7 @@ parser_isascii(struct parser_params *p)
} }
static void static void
setup_token_info(token_info *ptinfo, const char *ptr, const rb_code_location_t *loc) token_info_setup(token_info *ptinfo, const char *ptr, const rb_code_location_t *loc)
{ {
int column = 1, nonspc = 0, i; int column = 1, nonspc = 0, i;
for (i = 0; i < loc->beg_pos.column; i++, ptr++) { for (i = 0; i < loc->beg_pos.column; i++, ptr++) {
@ -5410,7 +5419,7 @@ token_info_push(struct parser_params *p, const char *token, const rb_code_locati
ptinfo = ALLOC(token_info); ptinfo = ALLOC(token_info);
ptinfo->token = token; ptinfo->token = token;
ptinfo->next = p->token_info; ptinfo->next = p->token_info;
setup_token_info(ptinfo, p->lex.pbeg, loc); token_info_setup(ptinfo, p->lex.pbeg, loc);
p->token_info = ptinfo; p->token_info = ptinfo;
} }
@ -5434,7 +5443,7 @@ token_info_warn(struct parser_params *p, const char *token, token_info *ptinfo_b
token_info ptinfo_end_body, *ptinfo_end = &ptinfo_end_body; token_info ptinfo_end_body, *ptinfo_end = &ptinfo_end_body;
if (!p->token_info_enabled) return; if (!p->token_info_enabled) return;
if (!ptinfo_beg) return; if (!ptinfo_beg) return;
setup_token_info(ptinfo_end, p->lex.pbeg, loc); token_info_setup(ptinfo_end, p->lex.pbeg, loc);
if (ptinfo_beg->beg.lineno == ptinfo_end->beg.lineno) return; /* ignore one-line block */ if (ptinfo_beg->beg.lineno == ptinfo_end->beg.lineno) return; /* ignore one-line block */
if (ptinfo_beg->nonspc || ptinfo_end->nonspc) return; /* ignore keyword in the middle of a line */ if (ptinfo_beg->nonspc || ptinfo_end->nonspc) return; /* ignore keyword in the middle of a line */
if (ptinfo_beg->indent == ptinfo_end->indent) return; /* the indents are matched */ if (ptinfo_beg->indent == ptinfo_end->indent) return; /* the indents are matched */

11
test/ruby/test_rubyoptions.rb
View File

@ -492,6 +492,7 @@ class TestRubyOptions < Test::Unit::TestCase
[" case nil", "when true; end"], [" case nil", "when true; end"],
["case nil; when true", "end"], ["case nil; when true", "end"],
["if false;", "end", "if true\nelse ", "end"], ["if false;", "end", "if true\nelse ", "end"],
["else", " end", "_ = if true\n"],
].each do ].each do
|b, e = 'end', pre = nil, post = nil| |b, e = 'end', pre = nil, post = nil|
src = ["#{pre}#{b}\n", " #{e}\n#{post}"] src = ["#{pre}#{b}\n", " #{e}\n#{post}"]
@ -500,7 +501,7 @@ class TestRubyOptions < Test::Unit::TestCase
n = 2 n = 2
n += pre.count("\n") if pre n += pre.count("\n") if pre
a.for("no directives with #{b}") do a.for("no directives with #{src}") do
err = ["#{t.path}:#{n}: warning: mismatched indentations at '#{e}' with '#{k}' at #{n-1}"] err = ["#{t.path}:#{n}: warning: mismatched indentations at '#{e}' with '#{k}' at #{n-1}"]
t.rewind t.rewind
t.truncate(0) t.truncate(0)
@ -510,7 +511,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err(["-wr", t.path, "-e", ""], "", [], err) assert_in_out_err(["-wr", t.path, "-e", ""], "", [], err)
end end
a.for("false directive with #{b}") do a.for("false directive with #{src}") do
t.rewind t.rewind
t.truncate(0) t.truncate(0)
t.puts "# -*- warn-indent: false -*-" t.puts "# -*- warn-indent: false -*-"
@ -519,7 +520,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err(["-w", t.path], "", [], [], '[ruby-core:25442]') assert_in_out_err(["-w", t.path], "", [], [], '[ruby-core:25442]')
end end
a.for("false and true directives with #{b}") do a.for("false and true directives with #{src}") do
err = ["#{t.path}:#{n+2}: warning: mismatched indentations at '#{e}' with '#{k}' at #{n+1}"] err = ["#{t.path}:#{n+2}: warning: mismatched indentations at '#{e}' with '#{k}' at #{n+1}"]
t.rewind t.rewind
t.truncate(0) t.truncate(0)
@ -530,7 +531,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err(["-w", t.path], "", [], err, '[ruby-core:25442]') assert_in_out_err(["-w", t.path], "", [], err, '[ruby-core:25442]')
end end
a.for("false directives after #{b}") do a.for("false directives after #{src}") do
t.rewind t.rewind
t.truncate(0) t.truncate(0)
t.puts "# -*- warn-indent: true -*-" t.puts "# -*- warn-indent: true -*-"
@ -541,7 +542,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err(["-w", t.path], "", [], [], '[ruby-core:25442]') assert_in_out_err(["-w", t.path], "", [], [], '[ruby-core:25442]')
end end
a.for("BOM with #{b}") do a.for("BOM with #{src}") do
err = ["#{t.path}:#{n}: warning: mismatched indentations at '#{e}' with '#{k}' at #{n-1}"] err = ["#{t.path}:#{n}: warning: mismatched indentations at '#{e}' with '#{k}' at #{n-1}"]
t.rewind t.rewind
t.truncate(0) t.truncate(0)