From 11337e7621eade026a916afacc88caab16c62410 Mon Sep 17 00:00:00 2001 From: Swastik Baranwal Date: Fri, 25 Aug 2023 22:26:39 +0530 Subject: [PATCH] checker: disallow `thread` as var name (#19174) --- vlib/v/checker/checker.v | 2 +- vlib/v/checker/tests/thread_as_var_name_err.out | 6 ++++++ vlib/v/checker/tests/thread_as_var_name_err.vv | 1 + vlib/v/tests/go_wait_3_test.v | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 vlib/v/checker/tests/thread_as_var_name_err.out create mode 100644 vlib/v/checker/tests/thread_as_var_name_err.vv diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v index 860371f71..21449217d 100644 --- a/vlib/v/checker/checker.v +++ b/vlib/v/checker/checker.v @@ -31,7 +31,7 @@ pub const ( array_builtin_methods_chk = token.new_keywords_matcher_from_array_trie(array_builtin_methods) // TODO: remove `byte` from this list when it is no longer supported reserved_type_names = ['byte', 'bool', 'char', 'i8', 'i16', 'int', 'i64', 'u8', 'u16', - 'u32', 'u64', 'f32', 'f64', 'map', 'string', 'rune', 'usize', 'isize', 'voidptr'] + 'u32', 'u64', 'f32', 'f64', 'map', 'string', 'rune', 'usize', 'isize', 'voidptr', 'thread'] reserved_type_names_chk = token.new_keywords_matcher_from_array_trie(reserved_type_names) vroot_is_deprecated_message = '@VROOT is deprecated, use @VMODROOT or @VEXEROOT instead' ) diff --git a/vlib/v/checker/tests/thread_as_var_name_err.out b/vlib/v/checker/tests/thread_as_var_name_err.out new file mode 100644 index 000000000..0bf0e973e --- /dev/null +++ b/vlib/v/checker/tests/thread_as_var_name_err.out @@ -0,0 +1,6 @@ +vlib/v/checker/tests/thread_as_var_name_err.vv:1:1: warning: unused variable: `thread` + 1 | thread := 4 + | ~~~~~~ +vlib/v/checker/tests/thread_as_var_name_err.vv:1:1: error: invalid use of reserved type `thread` as a variable name + 1 | thread := 4 + | ~~~~~~ diff --git a/vlib/v/checker/tests/thread_as_var_name_err.vv b/vlib/v/checker/tests/thread_as_var_name_err.vv new file mode 100644 index 000000000..d0a664f45 --- /dev/null +++ b/vlib/v/checker/tests/thread_as_var_name_err.vv @@ -0,0 +1 @@ +thread := 4 diff --git a/vlib/v/tests/go_wait_3_test.v b/vlib/v/tests/go_wait_3_test.v index 2466d4276..9225da01f 100644 --- a/vlib/v/tests/go_wait_3_test.v +++ b/vlib/v/tests/go_wait_3_test.v @@ -12,8 +12,8 @@ fn test_method_go_wait() { test: 'hi' } } - thread := spawn a.sub.get() - r := thread.wait() + t := spawn a.sub.get() + r := t.wait() assert r == 'hi' } -- 2.39.5