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: use reserved_type_names_chk.matches(word) instead of word in reserved_type_names

Browse Source
This commit is contained in:
Delyan Angelov 2022-07-29 23:09:49 +03:00
parent f0a8d57735
commit 0133ff2cbf
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/v/checker/assign.v
View File

@ -216,7 +216,7 @@ pub fn (mut c Checker) assign_stmt(mut node ast.AssignStmt) {
} else {
if is_decl {
c.check_valid_snake_case(left.name, 'variable name', left.pos)
if left.name in reserved_type_names {
if reserved_type_names_chk.matches(left.name) {
c.error('invalid use of reserved type `$left.name` as a variable name',
left.pos)
}

2
vlib/v/checker/fn.v
View File

@ -185,7 +185,7 @@ fn (mut c Checker) fn_decl(mut node ast.FnDecl) {
// Make sure all types are valid
for mut param in node.params {
c.ensure_type_exists(param.typ, param.type_pos) or { return }
if param.name in reserved_type_names {
if reserved_type_names_chk.matches(param.name) {
c.error('invalid use of reserved type `$param.name` as a parameter name',
param.pos)
}

4
vlib/v/checker/for.v
View File

@ -38,13 +38,13 @@ fn (mut c Checker) for_in_stmt(mut node ast.ForInStmt) {
typ_idx := typ.idx()
if node.key_var.len > 0 && node.key_var != '_' {
c.check_valid_snake_case(node.key_var, 'variable name', node.pos)
if node.key_var in reserved_type_names {
if reserved_type_names_chk.matches(node.key_var) {
c.error('invalid use of reserved type `$node.key_var` as key name', node.pos)
}
}
if node.val_var.len > 0 && node.val_var != '_' {
c.check_valid_snake_case(node.val_var, 'variable name', node.pos)
if node.val_var in reserved_type_names {
if reserved_type_names_chk.matches(node.val_var) {
c.error('invalid use of reserved type `$node.val_var` as value name', node.pos)
}
}

2
vlib/v/checker/interface.v
View File

@ -148,7 +148,7 @@ pub fn (mut c Checker) interface_decl(mut node ast.InterfaceDecl) {
has_generic_types = true
}
c.ensure_type_exists(param.typ, param.pos) or { return }
if param.name in reserved_type_names {
if reserved_type_names_chk.matches(param.name) {
c.error('invalid use of reserved type `$param.name` as a parameter name',
param.pos)
}