parser: fix checking unexpected name (#12233)

pull/12236/head
yuyi 2021-10-19 17:27:59 +08:00 committed by GitHub
parent c1aa782a6c
commit 6aca360507
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 7 deletions

View File

@ -1,4 +1,4 @@
vlib/v/checker/tests/error_with_comment_with_crlf_ending.vv:2:6: error: unexpected name `should`
vlib/v/checker/tests/error_with_comment_with_crlf_ending.vv:2:1: error: unexpected name `This`
1 | // Empty lines don't cause an issue but as soon as there's a comment with a CRLF ending, it fails
2 | This should cause an error!
| ~~~~~~
| ~~~~

View File

@ -1,4 +1,4 @@
vlib/v/checker/tests/error_with_comment_with_lf_ending.vv:2:6: error: unexpected name `should`
vlib/v/checker/tests/error_with_comment_with_lf_ending.vv:2:1: error: unexpected name `This`
1 | // Empty lines don't cause an issue but as soon as there's a comment with a CRLF ending, it fails
2 | This should cause an error!
| ~~~~~~
| ~~~~

View File

@ -1,5 +1,5 @@
vlib/v/checker/tests/multi_names_err.vv:2:4: error: unexpected name `a`
vlib/v/checker/tests/multi_names_err.vv:2:2: error: unexpected name `a`
1 | fn main() {
2 | a a a a := 1
| ^
| ^
3 | }

View File

@ -734,7 +734,7 @@ pub fn (mut p Parser) stmt(is_top_level bool) ast.Stmt {
pos: spos.extend(p.tok.position())
}
} else if p.peek_tok.kind == .name {
return p.error_with_pos('unexpected name `$p.peek_tok.lit`', p.peek_tok.position())
return p.error_with_pos('unexpected name `$p.tok.lit`', p.tok.position())
} else if !p.inside_if_expr && !p.inside_match_body && !p.inside_or_expr
&& p.peek_tok.kind in [.rcbr, .eof] && !p.mark_var_as_used(p.tok.lit) {
return p.error_with_pos('`$p.tok.lit` evaluated but not used', p.tok.position())

View File

@ -0,0 +1,6 @@
vlib/v/parser/tests/unexpected_name_err.vv:2:2: error: unexpected name `asfasfasfsfa`
1 | fn main() {
2 | asfasfasfsfa
| ~~~~~~~~~~~~
3 | println('text')
4 | }

View File

@ -0,0 +1,4 @@
fn main() {
asfasfasfsfa
println('text')
}