mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

ast, parser: add additional pos info for FnDecl and InterfaceDecl nodes (#9603)

Browse Source
This commit is contained in:
Ned Palacios
2021-04-05 23:14:21 +08:00
committed by GitHub
parent 6ed50e7678
commit 07b1dc66dd
5 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/v/parser/fn.v
View File

@@ -293,12 +293,14 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
}
}
// Return type
mut return_type_pos := p.tok.position()
mut return_type := ast.void_type
// don't confuse token on the next line: fn decl, [attribute]
same_line := p.tok.line_nr == p.prev_tok.line_nr
if (p.tok.kind.is_start_of_type() && (same_line || p.tok.kind != .lsbr))
|| (same_line && p.tok.kind == .key_fn) {
return_type = p.parse_type()
return_type_pos = return_type_pos.extend(p.prev_tok.position())
}
mut type_sym_method_idx := 0
no_body := p.tok.kind != .lcbr
@@ -398,6 +400,7 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
mod: p.mod
stmts: stmts
return_type: return_type
return_type_pos: return_type_pos
params: params
is_manualfree: is_manualfree
is_deprecated: is_deprecated
@@ -574,10 +577,12 @@ fn (mut p Parser) anon_fn() ast.AnonFn {
}
mut same_line := p.tok.line_nr == p.prev_tok.line_nr
mut return_type := ast.void_type
mut return_type_pos := p.tok.position()
// lpar: multiple return types
if same_line {
if p.tok.kind.is_start_of_type() {
return_type = p.parse_type()
return_type_pos = return_type_pos.extend(p.tok.position())
} else if p.tok.kind != .lcbr {
p.error_with_pos('expected return type, not $p.tok for anonymous function',
p.tok.position())
@@ -618,6 +623,7 @@ fn (mut p Parser) anon_fn() ast.AnonFn {
mod: p.mod
stmts: stmts
return_type: return_type
return_type_pos: return_type_pos
params: args
is_variadic: is_variadic
is_method: false

4
vlib/v/parser/struct.v
View File

@@ -518,7 +518,10 @@ fn (mut p Parser) interface_decl() ast.InterfaceDecl {
scope: p.scope
}
if p.tok.kind.is_start_of_type() && p.tok.line_nr == line_nr {
method.return_type_pos = p.tok.position()
method.return_type = p.parse_type()
method.return_type_pos = method.return_type_pos.extend(p.tok.position())
method.pos = method.pos.extend(method.return_type_pos)
}
mcomments := p.eat_comments(same_line: true)
mnext_comments := p.eat_comments({})
@@ -577,5 +580,6 @@ fn (mut p Parser) interface_decl() ast.InterfaceDecl {
pos: pos
pre_comments: pre_comments
mut_pos: mut_pos
name_pos: name_pos
}
}