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

checker: minor wording fix in an error

Browse Source
This commit is contained in:
Alexander Medvednikov
2023-07-14 12:34:25 +03:00
parent 7e067c5fb6
commit 877e6ddc9f
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,12 +385,12 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
} }
} }
// Args // Args
args2, are_args_type_only, mut is_variadic := p.fn_args() args2, are_params_type_only, mut is_variadic := p.fn_args()
if is_c2v_variadic { if is_c2v_variadic {
is_variadic = true is_variadic = true
} }
params << args2 params << args2
if !are_args_type_only { if !are_params_type_only {
for k, param in params { for k, param in params {
if p.scope.known_var(param.name) { if p.scope.known_var(param.name) {
p.error_with_pos('redefinition of parameter `${param.name}`', param.pos) p.error_with_pos('redefinition of parameter `${param.name}`', param.pos)
@@ -567,8 +567,8 @@ run them via `v file.v` instead',
p.inside_unsafe_fn = false p.inside_unsafe_fn = false
p.inside_fn = false p.inside_fn = false
} }
if !no_body && are_args_type_only { if !no_body && are_params_type_only {
p.error_with_pos('functions with type only args can not have bodies', body_start_pos) p.error_with_pos('functions with type only params can not have bodies', body_start_pos)
return ast.FnDecl{ return ast.FnDecl{
scope: 0 scope: 0
} }

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

@@ -1,3 +1,3 @@
vlib/v/parser/tests/fn_body_start_pos.vv:1:14: error: functions with type only args can not have bodies vlib/v/parser/tests/fn_body_start_pos.vv:1:14: error: functions with type only params can not have bodies
1 | fn func(int) {} 1 | fn func(int) {}
| ^ | ^

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

@@ -1,4 +1,4 @@
vlib/v/parser/tests/fn_type_only_args_no_body.vv:1:14: error: functions with type only args can not have bodies vlib/v/parser/tests/fn_type_only_args_no_body.vv:1:14: error: functions with type only params can not have bodies
1 | fn test(int) { 1 | fn test(int) {
| ^ | ^
2 | } 2 | }

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

@@ -1,4 +1,4 @@
vlib/v/parser/tests/fn_type_only_args_unknown_name.vv:1:16: error: functions with type only args can not have bodies vlib/v/parser/tests/fn_type_only_args_unknown_name.vv:1:16: error: functions with type only params can not have bodies
1 | fn test(param) { 1 | fn test(param) {
| ^ | ^
2 | } 2 | }

2
vlib/v/scanner/scanner.v
View File

@@ -891,6 +891,8 @@ fn (mut s Scanner) text_scan() token.Token {
at_error_msg += '\nAvailable compile time variables:\n${token.valid_at_tokens}' at_error_msg += '\nAvailable compile time variables:\n${token.valid_at_tokens}'
} }
s.error(at_error_msg) s.error(at_error_msg)
} else {
// s.note('@keyword is being deprecated and then removed from V. Use `keyword_` or a different name (e.g. `typ` instead of `type`)')
} }
return s.new_token(.name, name, name.len) return s.new_token(.name, name, name.len)
} }