From a42eb3b947b323db7a26fa50e5d5a4fd8ca9a56b Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Fri, 29 Jul 2022 20:58:45 +0300 Subject: [PATCH] cgen: use a trie matcher for c_reserved checks as well --- vlib/v/gen/c/cgen.v | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index 261ed3fdf1..a25b4d2723 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -26,7 +26,7 @@ const ( 'short', 'signed', 'sizeof', 'static', 'string', 'struct', 'switch', 'typedef', 'typename', 'union', 'unix', 'unsigned', 'void', 'volatile', 'while', 'template', 'true', 'small', 'stdout', 'stdin', 'stderr'] - c_reserved_map = string_array_to_map(c_reserved) + c_reserved_chk = token.new_keywords_matcher_from_array_trie(c_reserved) // same order as in token.Kind cmp_str = ['eq', 'ne', 'gt', 'lt', 'ge', 'le'] // when operands are switched @@ -5330,7 +5330,7 @@ fn (mut g Gen) or_block(var_name string, or_block ast.OrExpr, return_type ast.Ty [inline] fn c_name(name_ string) string { name := util.no_dots(name_) - if name in c.c_reserved_map { + if -1 != c.c_reserved_chk.find(name) { return '_v_$name' } return name