From 25d9272c8431903c3b23815f13c7a934c0f257bf Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Thu, 29 Apr 2021 14:06:50 +0800
Subject: [PATCH] all: rename `table.register_fn_generic_types` to
 `table.register_fn_concrete_types` (#9914)

---
 vlib/v/ast/table.v           | 2 +-
 vlib/v/checker/check_types.v | 2 +-
 vlib/v/checker/checker.v     | 6 +++---
 vlib/v/parser/fn.v           | 6 +++---
 vlib/v/parser/parser.v       | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/vlib/v/ast/table.v b/vlib/v/ast/table.v
index f7973b04a5..beefe3d849 100644
--- a/vlib/v/ast/table.v
+++ b/vlib/v/ast/table.v
@@ -909,7 +909,7 @@ pub fn (t &Table) mktyp(typ Type) Type {
 	}
 }
 
-pub fn (mut t Table) register_fn_generic_types(fn_name string, types []Type) {
+pub fn (mut t Table) register_fn_concrete_types(fn_name string, types []Type) {
 	mut a := t.fn_generic_types[fn_name]
 	if types in a {
 		return
diff --git a/vlib/v/checker/check_types.v b/vlib/v/checker/check_types.v
index 078c667d35..c204a64180 100644
--- a/vlib/v/checker/check_types.v
+++ b/vlib/v/checker/check_types.v
@@ -571,5 +571,5 @@ pub fn (mut c Checker) infer_fn_generic_types(f ast.Fn, mut call_expr ast.CallEx
 		inferred_types << typ
 		call_expr.concrete_types << typ
 	}
-	c.table.register_fn_generic_types(f.name, inferred_types)
+	c.table.register_fn_concrete_types(f.name, inferred_types)
 }
diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
index 09dd52840d..4e3661bf48 100644
--- a/vlib/v/checker/checker.v
+++ b/vlib/v/checker/checker.v
@@ -1527,7 +1527,7 @@ pub fn (mut c Checker) method_call(mut call_expr ast.CallExpr) ast.Type {
 		}
 	}
 	if has_generic {
-		c.table.register_fn_generic_types(call_expr.name, concrete_types)
+		c.table.register_fn_concrete_types(call_expr.name, concrete_types)
 	}
 	// TODO: remove this for actual methods, use only for compiler magic
 	// FIXME: Argument count != 1 will break these
@@ -1992,9 +1992,9 @@ pub fn (mut c Checker) fn_call(mut call_expr ast.CallExpr) ast.Type {
 	if has_generic {
 		if c.mod != '' && !fn_name.starts_with('${c.mod}.') {
 			// Need to prepend the module when adding a generic type to a function
-			c.table.register_fn_generic_types(c.mod + '.' + fn_name, concrete_types)
+			c.table.register_fn_concrete_types(c.mod + '.' + fn_name, concrete_types)
 		} else {
-			c.table.register_fn_generic_types(fn_name, concrete_types)
+			c.table.register_fn_concrete_types(fn_name, concrete_types)
 		}
 	}
 	if fn_name == 'json.encode' {
diff --git a/vlib/v/parser/fn.v b/vlib/v/parser/fn.v
index 5bf6329dc5..21ab9cdd2d 100644
--- a/vlib/v/parser/fn.v
+++ b/vlib/v/parser/fn.v
@@ -43,10 +43,10 @@ pub fn (mut p Parser) call_expr(language ast.Language, mod string) ast.CallExpr
 		// In case of `foo<T>()`
 		// T is unwrapped and registered in the checker.
 		full_generic_fn_name := if fn_name.contains('.') { fn_name } else { p.prepend_mod(fn_name) }
-		has_generic_generic := concrete_types.filter(it.has_flag(.generic)).len > 0
-		if !has_generic_generic {
+		has_generic := concrete_types.filter(it.has_flag(.generic)).len > 0
+		if !has_generic {
 			// will be added in checker
-			p.table.register_fn_generic_types(full_generic_fn_name, concrete_types)
+			p.table.register_fn_concrete_types(full_generic_fn_name, concrete_types)
 		}
 	}
 	p.check(.lpar)
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
index f2ec38b509..c4acba342d 100644
--- a/vlib/v/parser/parser.v
+++ b/vlib/v/parser/parser.v
@@ -2237,10 +2237,10 @@ fn (mut p Parser) dot_expr(left ast.Expr) ast.Expr {
 		concrete_list_pos = concrete_list_pos.extend(p.prev_tok.position())
 		// In case of `foo<T>()`
 		// T is unwrapped and registered in the checker.
-		has_generic_generic := concrete_types.filter(it.has_flag(.generic)).len > 0
-		if !has_generic_generic {
+		has_generic := concrete_types.filter(it.has_flag(.generic)).len > 0
+		if !has_generic {
 			// will be added in checker
-			p.table.register_fn_generic_types(field_name, concrete_types)
+			p.table.register_fn_concrete_types(field_name, concrete_types)
 		}
 	}
 	if p.tok.kind == .lpar {