File tree Expand file tree Collapse file tree 4 files changed +5
-5
lines changed Expand file tree Collapse file tree 4 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -216,7 +216,7 @@ pub fn (mut c Checker) assign_stmt(mut node ast.AssignStmt) {
216
216
} else {
217
217
if is_decl {
218
218
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) {
220
220
c.error ('invalid use of reserved type `$left.name ` as a variable name' ,
221
221
left.pos)
222
222
}
Original file line number Diff line number Diff line change @@ -185,7 +185,7 @@ fn (mut c Checker) fn_decl(mut node ast.FnDecl) {
185
185
// Make sure all types are valid
186
186
for mut param in node.params {
187
187
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) {
189
189
c.error ('invalid use of reserved type `$param.name ` as a parameter name' ,
190
190
param.pos)
191
191
}
Original file line number Diff line number Diff line change @@ -38,13 +38,13 @@ fn (mut c Checker) for_in_stmt(mut node ast.ForInStmt) {
38
38
typ_idx := typ.idx ()
39
39
if node.key_var.len > 0 && node.key_var != '_' {
40
40
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) {
42
42
c.error ('invalid use of reserved type `$node.key_var ` as key name' , node.pos)
43
43
}
44
44
}
45
45
if node.val_var.len > 0 && node.val_var != '_' {
46
46
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) {
48
48
c.error ('invalid use of reserved type `$node.val_var ` as value name' , node.pos)
49
49
}
50
50
}
Original file line number Diff line number Diff line change @@ -148,7 +148,7 @@ pub fn (mut c Checker) interface_decl(mut node ast.InterfaceDecl) {
148
148
has_generic_types = true
149
149
}
150
150
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) {
152
152
c.error ('invalid use of reserved type `$param.name ` as a parameter name' ,
153
153
param.pos)
154
154
}
You can’t perform that action at this time.
0 commit comments