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

parser: fix fn args eol errors (#7222)

Browse Source
This commit is contained in:
Daniel Däschle 2020-12-10 10:56:08 +01:00 committed by GitHub
parent 0bf679a7aa
commit 1f952330c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/v/checker/tests/globals/no_type.out
View File

@ -1,3 +1,3 @@
vlib/v/checker/tests/globals/no_type.vv:1:17: error: bad type syntax
vlib/v/checker/tests/globals/no_type.vv:1:17: error: expecting type declaration
1 | __global ( test )
| ^

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

@ -431,6 +431,10 @@ fn (mut p Parser) fn_args() ([]table.Param, bool, bool) {
// p.warn('types only')
mut arg_no := 1
for p.tok.kind != .rpar {
if p.tok.kind == .eof {
p.error_with_pos('expecting `)`', p.tok.position())
return []table.Param{}, false, false
}
is_shared := p.tok.kind == .key_shared
is_atomic := p.tok.kind == .key_atomic
is_mut := p.tok.kind == .key_mut || is_shared || is_atomic
@ -443,6 +447,10 @@ fn (mut p Parser) fn_args() ([]table.Param, bool, bool) {
}
pos := p.tok.position()
mut arg_type := p.parse_type()
if arg_type == 0 {
// error is added in parse_type
return []table.Param{}, false, false
}
if is_mut {
if !arg_type.has_flag(.generic) {
if is_shared {
@ -471,6 +479,10 @@ fn (mut p Parser) fn_args() ([]table.Param, bool, bool) {
if is_variadic {
arg_type = arg_type.set_flag(.variadic)
}
if p.tok.kind == .eof {
p.error_with_pos('expecting `)`', p.prev_tok.position())
return []table.Param{}, false, false
}
if p.tok.kind == .comma {
if is_variadic {
p.error_with_pos('cannot use ...(variadic) with non-final parameter no $arg_no',
@ -493,6 +505,10 @@ fn (mut p Parser) fn_args() ([]table.Param, bool, bool) {
}
} else {
for p.tok.kind != .rpar {
if p.tok.kind == .eof {
p.error_with_pos('expecting `)`', p.tok.position())
return []table.Param{}, false, false
}
is_shared := p.tok.kind == .key_shared
is_atomic := p.tok.kind == .key_atomic
mut is_mut := p.tok.kind == .key_mut || is_shared || is_atomic
@ -522,6 +538,10 @@ fn (mut p Parser) fn_args() ([]table.Param, bool, bool) {
}
pos := p.tok.position()
mut typ := p.parse_type()
if typ == 0 {
// error is added in parse_type
return []table.Param{}, false, false
}
if is_mut {
if !typ.has_flag(.generic) {
if is_shared {
@ -561,6 +581,10 @@ fn (mut p Parser) fn_args() ([]table.Param, bool, bool) {
return []table.Param{}, false, false
}
}
if p.tok.kind == .eof {
p.error_with_pos('expecting `)`', p.prev_tok.position())
return []table.Param{}, false, false
}
if p.tok.kind != .rpar {
p.check(.comma)
}

2
vlib/v/parser/parse_type.v
View File

@ -254,7 +254,7 @@ pub fn (mut p Parser) parse_any_type(language table.Language, is_ptr bool, check
}
if name == '' {
// This means the developer is using some wrong syntax like `x: int` instead of `x int`
p.error('bad type syntax')
p.error('expecting type declaration')
return 0
}
match name {

2
vlib/v/parser/tests/c_struct_no_embed.out
View File

@ -1,4 +1,4 @@
vlib/v/parser/tests/c_struct_no_embed.vv:7:1: error: bad type syntax
vlib/v/parser/tests/c_struct_no_embed.vv:7:1: error: expecting type declaration
5 | struct C.Unknown {
6 | Foo
7 | }