From 4dc703af2d8f5ade51bbd44953c66c68d2c824a7 Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Sat, 20 Jun 2020 07:40:33 +0800
Subject: [PATCH] cgen: fix nested array equality

---
 vlib/v/gen/cgen.v                  | 12 ++++++------
 vlib/v/tests/array_equality_test.v | 24 ++++++++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/vlib/v/gen/cgen.v b/vlib/v/gen/cgen.v
index b3558295a9..27af60e22f 100644
--- a/vlib/v/gen/cgen.v
+++ b/vlib/v/gen/cgen.v
@@ -2656,15 +2656,15 @@ fn (mut g Gen) assoc(node ast.Assoc) {
 }
 
 fn (mut g Gen) gen_array_equality_fn(left table.Type) string {
-	styp := g.table.value_type(left)
 	left_sym := g.table.get_type_symbol(left)
 	typ_name := g.typ(left)
 	ptr_typ := typ_name[typ_name.index_after('_', 0) + 1..]
 	elem_sym := g.table.get_type_symbol(left_sym.array_info().elem_type)
-	mut elem_typ := ''
+	elem_typ := g.typ(left_sym.array_info().elem_type)
+	ptr_elem_typ := elem_typ[elem_typ.index_after('_', 0) + 1..]
 	if elem_sym.kind == .array {
-		// Recursively generate array element comparison function code and return element type name
-		elem_typ = g.gen_array_equality_fn(left_sym.array_info().elem_type)
+		// Recursively generate array element comparison function code if array element is array type
+		g.gen_array_equality_fn(left_sym.array_info().elem_type)
 	}
 	if ptr_typ in g.array_fn_definitions {
 		return ptr_typ
@@ -2675,12 +2675,12 @@ fn (mut g Gen) gen_array_equality_fn(left table.Type) string {
 	g.definitions.writeln('\t\treturn false;')
 	g.definitions.writeln('\t}')
 	g.definitions.writeln('\tfor (int i = 0; i < a.len; i++) {')
-	if styp == table.string_type_idx {
+	if elem_sym.kind == .string {
 		g.definitions.writeln('\t\tif (string_ne(*(($ptr_typ*)((byte*)a.data+(i*a.element_size))), *(($ptr_typ*)((byte*)b.data+(i*b.element_size))))) {')
 	} else if elem_sym.kind == .struct_ {
 		g.definitions.writeln('\t\tif (memcmp((byte*)a.data+(i*a.element_size), (byte*)b.data+(i*b.element_size), a.element_size)) {')
 	} else if elem_sym.kind == .array {
-		g.definitions.writeln('\t\tif (!${elem_typ}_arr_eq(a, b)) {')
+		g.definitions.writeln('\t\tif (!${ptr_elem_typ}_arr_eq((($elem_typ*)a.data)[i], (($elem_typ*)b.data)[i])) {')
 	} else {
 		g.definitions.writeln('\t\tif (*(($ptr_typ*)((byte*)a.data+(i*a.element_size))) != *(($ptr_typ*)((byte*)b.data+(i*b.element_size)))) {')
 	}
diff --git a/vlib/v/tests/array_equality_test.v b/vlib/v/tests/array_equality_test.v
index 0a886a9d91..d6b0cd6536 100644
--- a/vlib/v/tests/array_equality_test.v
+++ b/vlib/v/tests/array_equality_test.v
@@ -46,10 +46,22 @@ fn test_array_equality() {
 }
 
 fn test_nested_array_equality() {
-	a := [[1]]
-	assert a == [[1]]
-	b := [[[[1]]]]
-	assert b == [[[[1]]]]
-	c := [[[1,2,3]]]
-	assert c == [[[1,2,3]]]
+	a1 := [[1]]
+	assert a1 == [[1]]
+	a2 := [[[[1]]]]
+	assert a2 == [[[[1]]]]
+	a3 := [[[1,2,3]]]
+	assert a3 == [[[1,2,3]]]
+	a4 := [[1.1], [2.2]]
+	assert a4 == [[1.1], [2.2]]
+	a5 := [[[[1,2], [2,3], [3,4]]]]
+	assert a5 == [[[[1,2], [2,3], [3,4]]]]
+	a6 := [[['aa', 'bb'], ['cc', 'dd']]]
+	assert a6 == [[['aa', 'bb'], ['cc', 'dd']]]
+	a7 := [[[true], [false]]]
+	assert a7 == [[[true], [false]]]
+	a8 := [[[[`a`, `b`], [`c`, `d`]]]]
+	assert a8 == [[[[`a`, `b`], [`c`, `d`]]]]
+	a9 := [[[u16(22), 11]]]
+	assert a9 == [[[u16(22), 11]]]
 }