From 336305daa5e901f753259c69f7c9862bd3ec158e Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Fri, 29 Jul 2022 23:01:30 +0300
Subject: [PATCH] scanner,parser,gen: use `km.matches(word)` instead of
 `km.find(word) != -1`

---
 vlib/v/ast/ast.v         | 2 +-
 vlib/v/gen/c/cgen.v      | 2 +-
 vlib/v/parser/if_match.v | 2 +-
 vlib/v/scanner/scanner.v | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vlib/v/ast/ast.v b/vlib/v/ast/ast.v
index b1654381ac..699055a498 100644
--- a/vlib/v/ast/ast.v
+++ b/vlib/v/ast/ast.v
@@ -2266,7 +2266,7 @@ pub fn type_can_start_with_token(tok &token.Token) bool {
 	match tok.kind {
 		.name {
 			return (tok.lit.len > 0 && tok.lit[0].is_capital())
-				|| builtin_type_names_matcher.find(tok.lit) > 0
+				|| builtin_type_names_matcher.matches(tok.lit)
 		}
 		// Note: return type (T1, T2) should be handled elsewhere
 		.amp, .key_fn, .lsbr, .question {
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
index a25b4d2723..2ba3c79ad8 100644
--- a/vlib/v/gen/c/cgen.v
+++ b/vlib/v/gen/c/cgen.v
@@ -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 -1 != c.c_reserved_chk.find(name) {
+	if c.c_reserved_chk.matches(name) {
 		return '_v_$name'
 	}
 	return name
diff --git a/vlib/v/parser/if_match.v b/vlib/v/parser/if_match.v
index fe6dfc7f99..e07dcc5e91 100644
--- a/vlib/v/parser/if_match.v
+++ b/vlib/v/parser/if_match.v
@@ -235,7 +235,7 @@ fn (mut p Parser) match_expr() ast.MatchExpr {
 			is_else = true
 			p.next()
 		} else if (p.tok.kind == .name && !(p.tok.lit == 'C' && p.peek_tok.kind == .dot)
-			&& (((ast.builtin_type_names_matcher.find(p.tok.lit) > 0 || p.tok.lit[0].is_capital())
+			&& (((ast.builtin_type_names_matcher.matches(p.tok.lit) || p.tok.lit[0].is_capital())
 			&& p.peek_tok.kind != .lpar) || (p.peek_tok.kind == .dot && p.peek_token(2).lit.len > 0
 			&& p.peek_token(2).lit[0].is_capital()))) || p.is_only_array_type() {
 			mut types := []ast.Type{}
diff --git a/vlib/v/scanner/scanner.v b/vlib/v/scanner/scanner.v
index ee3dce6904..fa9694a977 100644
--- a/vlib/v/scanner/scanner.v
+++ b/vlib/v/scanner/scanner.v
@@ -940,7 +940,7 @@ fn (mut s Scanner) text_scan() token.Token {
 							typs.all(it.len > 0
 								&& ((it[0].is_capital() && it[1..].bytes().all(it.is_alnum()
 								|| it == `_`))
-								|| ast.builtin_type_names_matcher.find(it) > 0))
+								|| ast.builtin_type_names_matcher.matches(it)))
 						} else {
 							false
 						}