Skip to content

Commit 0133ff2

Browse files
committed
checker: use reserved_type_names_chk.matches(word) instead of word in reserved_type_names
1 parent f0a8d57 commit 0133ff2

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

vlib/v/checker/assign.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ pub fn (mut c Checker) assign_stmt(mut node ast.AssignStmt) {
216216
} else {
217217
if is_decl {
218218
c.check_valid_snake_case(left.name, 'variable name', left.pos)
219-
if left.name in reserved_type_names {
219+
if reserved_type_names_chk.matches(left.name) {
220220
c.error('invalid use of reserved type `$left.name` as a variable name',
221221
left.pos)
222222
}

vlib/v/checker/fn.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ fn (mut c Checker) fn_decl(mut node ast.FnDecl) {
185185
// Make sure all types are valid
186186
for mut param in node.params {
187187
c.ensure_type_exists(param.typ, param.type_pos) or { return }
188-
if param.name in reserved_type_names {
188+
if reserved_type_names_chk.matches(param.name) {
189189
c.error('invalid use of reserved type `$param.name` as a parameter name',
190190
param.pos)
191191
}

vlib/v/checker/for.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ fn (mut c Checker) for_in_stmt(mut node ast.ForInStmt) {
3838
typ_idx := typ.idx()
3939
if node.key_var.len > 0 && node.key_var != '_' {
4040
c.check_valid_snake_case(node.key_var, 'variable name', node.pos)
41-
if node.key_var in reserved_type_names {
41+
if reserved_type_names_chk.matches(node.key_var) {
4242
c.error('invalid use of reserved type `$node.key_var` as key name', node.pos)
4343
}
4444
}
4545
if node.val_var.len > 0 && node.val_var != '_' {
4646
c.check_valid_snake_case(node.val_var, 'variable name', node.pos)
47-
if node.val_var in reserved_type_names {
47+
if reserved_type_names_chk.matches(node.val_var) {
4848
c.error('invalid use of reserved type `$node.val_var` as value name', node.pos)
4949
}
5050
}

vlib/v/checker/interface.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ pub fn (mut c Checker) interface_decl(mut node ast.InterfaceDecl) {
148148
has_generic_types = true
149149
}
150150
c.ensure_type_exists(param.typ, param.pos) or { return }
151-
if param.name in reserved_type_names {
151+
if reserved_type_names_chk.matches(param.name) {
152152
c.error('invalid use of reserved type `$param.name` as a parameter name',
153153
param.pos)
154154
}

0 commit comments

Comments
 (0)