Fix table.merge for array-based tables.

Author: tritao

src/base/table.lua

@@ -373,18 +373,22 @@
 		local result = {}
 		local arg = {...}
 		for _,t in ipairs(arg) do
-
 			if type(t) == "table" then
-				for k,v in pairs(t) do
-					if type(result[k]) == "table" and type(v) == "table" then
-						result[k] = table.merge(result[k], v)
-					else
-						result[k] = v
+				if #t > 0 then  -- Array-based table
+					for i = 1, #t do
+						table.insert(result, t[i])
+					end
+				else  -- Key-value table
+					for k, v in pairs(t) do
+						if type(result[k]) == "table" and type(v) == "table" then
+							result[k] = table.merge(result[k], v)
+						else
+							result[k] = v
+						end
 					end
 				end
-
 			else
-				error("invalid value")
+				error("invalid value, expected table")
 			end
 		end
 

tests/base/test_table.lua

@@ -95,3 +95,26 @@
 		test.istrue(t[4] == 5)
 		test.istrue(t[5] == 8)
 	end
+
+--
+-- table.merge() tests
+--
+
+function suite.merge()
+	t = { "a", "b" }
+	t2 = { "c", "d" }
+	test.isequal({ "a", "b", "c", "d" }, table.merge(t, t2))
+
+	t = { "a", "b" }
+	t2 = { "c", "d", { "e" } }
+	test.isequal({ "a", "b", "c", "d", { "e" } }, table.merge(t, t2))
+
+	t = { a = 1, b = 2 }
+	t2 = { c = 3, d = 4 }
+	test.isequal({ a = 1, b = 2, c = 3, d = 4 }, table.merge(t, t2))
+
+	t = { a = 1, b = 2 }
+	t2 = { c = 3, d = 4, e = { a = 5 } }
+	print(table.tostring(table.merge(t, t2), 2))
+	test.isequal({ a = 1, b = 2, c = 3, d = 4, e = { a = 5 } }, table.merge(t, t2))
+end