From 0133ff2cbfbf362fc75b37ed96d966c90a6c2952 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Fri, 29 Jul 2022 23:09:49 +0300 Subject: [PATCH] checker: use reserved_type_names_chk.matches(word) instead of `word in reserved_type_names` --- vlib/v/checker/assign.v | 2 +- vlib/v/checker/fn.v | 2 +- vlib/v/checker/for.v | 4 ++-- vlib/v/checker/interface.v | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vlib/v/checker/assign.v b/vlib/v/checker/assign.v index 8bec61c178..9ab71ad623 100644 --- a/vlib/v/checker/assign.v +++ b/vlib/v/checker/assign.v @@ -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) } diff --git a/vlib/v/checker/fn.v b/vlib/v/checker/fn.v index 3994c403c5..a69043c6f4 100644 --- a/vlib/v/checker/fn.v +++ b/vlib/v/checker/fn.v @@ -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) } diff --git a/vlib/v/checker/for.v b/vlib/v/checker/for.v index 22c8f76d07..d1ac711ac9 100644 --- a/vlib/v/checker/for.v +++ b/vlib/v/checker/for.v @@ -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) } } diff --git a/vlib/v/checker/interface.v b/vlib/v/checker/interface.v index 8e62cf9ba5..15dd1bf1f2 100644 --- a/vlib/v/checker/interface.v +++ b/vlib/v/checker/interface.v @@ -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) }