From d3deaa1f591c97380040daffc476ddca63835283 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Tue, 1 Dec 2020 23:11:37 +0800
Subject: [PATCH] cgen: fix typeof variadic type (#7063)

---
 vlib/v/gen/cgen.v          |  2 ++
 vlib/v/tests/typeof_test.v | 58 +++++++++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/vlib/v/gen/cgen.v b/vlib/v/gen/cgen.v
index 3a9683e276..5f4bcfd3f9 100644
--- a/vlib/v/gen/cgen.v
+++ b/vlib/v/gen/cgen.v
@@ -2663,6 +2663,8 @@ fn (mut g Gen) typeof_expr(node ast.TypeOf) {
 			repr += ' ${util.strip_main_name(g.table.get_type_name(fn_info.return_type))}'
 		}
 		g.write('tos_lit("$repr")')
+	} else if node.expr_type.has_flag(.variadic) {
+		g.write('tos_lit("...${util.strip_main_name(sym.name)}")')
 	} else {
 		g.write('tos_lit("${util.strip_main_name(sym.name)}")')
 	}
diff --git a/vlib/v/tests/typeof_test.v b/vlib/v/tests/typeof_test.v
index 22d38e1907..0be7d7d68e 100644
--- a/vlib/v/tests/typeof_test.v
+++ b/vlib/v/tests/typeof_test.v
@@ -2,7 +2,7 @@ fn test_typeof_on_simple_expressions() {
 	a := int(123)
 	assert typeof(int(42)) == 'int'
 	assert typeof(f64(3.14)) == 'f64'
-	assert typeof(int(2)+2*10) == 'int'
+	assert typeof(int(2) + 2 * 10) == 'int'
 	assert typeof(f64(1.0) * 12.2) == 'f64'
 	// assert typeof(1.0 * f32(12.2)) == 'f32'
 	assert typeof(a) == 'int'
@@ -47,13 +47,13 @@ fn test_typeof_on_structs() {
 	assert typeof(astruct_dynamic).name == '[]FooBar'
 }
 
-type MySumType = int | f32 | FooBar
+type MySumType = FooBar | f32 | int
 
 pub fn (ms MySumType) str() string {
 	match ms {
 		int { return ms.str() }
 		f32 { return ms.str() }
-		//FooBar { return it.x.str() }
+		// FooBar { return it.x.str() }
 		else { return 'unknown: ' + typeof(ms) }
 	}
 }
@@ -61,7 +61,9 @@ pub fn (ms MySumType) str() string {
 fn test_typeof_on_sumtypes() {
 	a := MySumType(int(32))
 	b := MySumType(f32(123.0))
-	c := MySumType(FooBar{x:43})
+	c := MySumType(FooBar{
+		x: 43
+	})
 	assert typeof(a) == 'int'
 	assert typeof(b) == 'f32'
 	assert typeof(c) == 'FooBar'
@@ -75,11 +77,20 @@ fn test_typeof_on_sumtypes() {
 }
 
 //
+struct UnaryExpr {
+	a string
+}
 
-struct UnaryExpr { a string }
-struct BinExpr { a string b string }
-struct BoolExpr { z int }
-type ExprType = BoolExpr | BinExpr | UnaryExpr
+struct BinExpr {
+	a string
+	b string
+}
+
+struct BoolExpr {
+	z int
+}
+
+type ExprType = BinExpr | BoolExpr | UnaryExpr
 
 fn fexpr(k int) ExprType {
 	match k {
@@ -108,10 +119,14 @@ fn test_typeof_on_sumtypes_of_structs() {
 fn myfn(i int) int {
 	return i
 }
-fn myfn2() {}
+
+fn myfn2() {
+}
+
 fn myfn3(i int, s string) byte {
 	return byte(0)
 }
+
 fn myfn4() i8 {
 	return -1
 }
@@ -139,13 +154,30 @@ fn array_item_type<T>(v []T) string {
 fn test_generic_type() {
 	v := 5
 	assert type_name(v) == 'int'
-	//assert type_name(&v) == '&int'
-	//assert type_name([v]!!) == '[1]int'
+	// assert type_name(&v) == '&int'
+	// assert type_name([v]!!) == '[1]int'
 	assert type_name([v]) == '[]int'
 	assert type_name([[v]]) == '[][]int'
 	assert type_name(FooBar{}) == 'FooBar'
-
 	assert array_item_type([v]) == 'int'
 	assert array_item_type([[v]]) == '[]int'
-	//assert array_item_type([&v]) == '&int'
+	// assert array_item_type([&v]) == '&int'
+}
+
+fn variadic_int(x ...int) string {
+	return typeof(x)
+}
+
+fn variadic_bool(x ...bool) string {
+	return typeof(x)
+}
+
+fn variadic_f64(x ...f64) string {
+	return typeof(x)
+}
+
+fn test_variadic_type() {
+	assert variadic_int(1, 2, 3) == '...int'
+	assert variadic_bool(true, false) == '...bool'
+	assert variadic_f64(3.1, 3.2) == '...f64'
 }