From 0dd92b2c2edb731c1e4b67224d82a20c1faaa5d3 Mon Sep 17 00:00:00 2001
From: Max Cahill <1bardesign@gmail.com>
Date: Thu, 12 Mar 2020 21:15:18 +1100
Subject: [PATCH] [moved] table.copy from functional.lua to table.lua and
 updated signature a little to allow deep overlays

---
 functional.lua | 19 -------------------
 table.lua      | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/functional.lua b/functional.lua
index 2afd891..085900e 100644
--- a/functional.lua
+++ b/functional.lua
@@ -128,25 +128,6 @@ function table.append(t1, t2)
 	return r
 end
 
---copy a table
---	if deep specified:
---		calls copy method of member directly if it exists
---		and recurses into all "normal" table children
-function table.copy(t, deep)
-	local r = {}
-	for k,v in pairs(t) do
-		if deep and type(v) == "table" then
-			if type(v.copy) == "function" then
-				v = v:copy()
-			else
-				v = table.copy(v, deep)
-			end
-		end
-		r[k] = v
-	end
-	return r
-end
-
 -----------------------------------------------------------
 --common queries and reductions
 -----------------------------------------------------------
diff --git a/table.lua b/table.lua
index a87afbb..4f279b8 100644
--- a/table.lua
+++ b/table.lua
@@ -101,13 +101,14 @@ if table.clear == nil then
 	--useful when multiple references are floating around
 	--so you cannot just pop a new table out of nowhere
 	function table.clear(t)
-		assert(type(to) == "table", "table.overlay - argument 'to' must be a table")
+		assert(type(to) == "table", "table.clear - argument 't' must be a table")
 		while t[1] ~= nil do
 			table.remove(t)
 		end
 	end
 end
 
+--overlay one table directly onto another, shallow only
 function table.overlay(to, from)
 	assert(type(to) == "table", "table.overlay - argument 'to' must be a table")
 	assert(type(from) == "table", "table.overlay - argument 'from' must be a table")
@@ -116,3 +117,34 @@ function table.overlay(to, from)
 	end
 	return to
 end
+
+--copy a table
+--	deep_or_into is either:
+--		a boolean value, used as deep flag directly
+--		or a table to copy into, which implies a deep copy
+--	if deep specified:
+--		calls copy method of member directly if it exists
+--		and recurses into all "normal" table children
+--	if into specified, copies into that table
+--		but doesn't clear anything out
+--		(useful for deep overlays and avoiding garbage)
+function table.copy(t, deep_or_into)
+	assert(type(t) == "table", "table.copy - argument 't' must be a table")
+	local is_bool = type(deep_or_into) == "boolean"
+	local is_table = type(deep_or_into) == "table"
+
+	local deep = (is_bool and deep_or_into) or is_table
+	local into = is_table and deep_or_into or {}
+	for k,v in pairs(t) do
+		if deep and type(v) == "table" then
+			if type(v.copy) == "function" then
+				v = v:copy()
+			else
+				v = table.copy(v, deep)
+			end
+		end
+		into[k] = v
+	end
+	return into
+end
+