parser: fix panic when single letter receiver parsed (#8381)

pull/8391/head
Daniel Däschle 2021-01-28 10:56:43 +01:00 committed by GitHub
parent 5fc7eadd8b
commit 93b0d8ca64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 51 additions and 44 deletions

View File

@ -5296,7 +5296,7 @@ fn (mut c Checker) fn_decl(mut node ast.FnDecl) {
sym := c.table.get_type_symbol(arg.typ)
if sym.kind == .placeholder
|| (sym.kind in [table.Kind.int_literal, .float_literal] && !c.is_builtin_mod) {
c.error('unknown type `$sym.name`', node.pos)
c.error('unknown type `$sym.name`', node.receiver_pos)
}
}
}

View File

@ -0,0 +1,3 @@
vlib/v/checker/tests/receiver_unknown_type_single_letter.vv:1:5: error: unknown type `A`
1 | fn (p A) foo() {}
| ~~~

View File

@ -0,0 +1 @@
fn (p A) foo() {}

View File

@ -190,6 +190,7 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
mut rec_mut := false
mut params := []table.Param{}
if p.tok.kind == .lpar {
p.is_parsing_receiver = true
lpar_pos := p.tok.position()
p.next() // (
is_method = true
@ -246,6 +247,7 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
typ: rec_type
}
p.check(.rpar)
p.is_parsing_receiver = false
}
mut name := ''
if p.tok.kind == .name {

View File

@ -373,7 +373,7 @@ pub fn (mut p Parser) parse_any_type(language table.Language, is_ptr bool, check
return table.int_literal_type
}
else {
if name.len == 1 && name[0].is_capital() {
if name.len == 1 && name[0].is_capital() && !p.is_parsing_receiver {
return p.parse_generic_template_type(name)
}
if p.peek_tok.kind == .lt {

View File

@ -71,6 +71,7 @@ mut:
cur_fn_name string
in_generic_params bool // indicates if parsing between `<` and `>` of a method/function
name_error bool // indicates if the token is not a name or the name is on another line
is_parsing_receiver bool // indicates if parser is parsing receiver fn (x Xxx)
}
// for tests