From e6e59dbe880697e1f97f46d61aeaa5161d6da7ef Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Wed, 7 Jun 2017 20:02:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B8=D0=B7=D0=B4=D0=B5=D1=86=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B2=D0=B0=D0=B6=D0=BD=D0=B0=D1=8F=20=D1=84=D0=B8?= =?UTF-8?q?=D1=87=D0=B0=20=D1=81=D0=BE=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D1=81=20=D0=BE=D0=BF=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D0=BE=D0=B2=D1=81=D0=BA=D0=B8=D0=BC=20=D1=81?= =?UTF-8?q?=D0=BE=D1=84=D1=82=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications.cfg | 2 +- lib/serialization.lua | 25 ++++++++----------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Applications.cfg b/Applications.cfg index b5a55119..7bb9671a 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -257,7 +257,7 @@ path="/lib/serialization.lua", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/serialization.lua", type="Library", - version=1.05, + version=1.06, }, { path="/lib/GUI.lua", diff --git a/lib/serialization.lua b/lib/serialization.lua index aaff711a..2e5bf933 100755 --- a/lib/serialization.lua +++ b/lib/serialization.lua @@ -4,26 +4,17 @@ local serialization = {} ------------------------------------------------- Public methods ----------------------------------------------------------------- -function serialization.serialize(...) - return table.serialize(...) +function serialization.serialize(variable, ...) + local variableType = type(variable) + if variableType == "table" then + return table.serialize(variable, ...) + else + return tostring(variableType) + end end -function serialization.unserialize(...) - return table.unserialize(...) -end - -function serialization.serializeToFile(...) - table.toFile(...) -end - -function serialization.unserializeFromFile(...) - return table.fromFIle(...) -end +serialization.unserialize = table.unserialize ---------------------------------------------------------------------------------------------------------------------- return serialization - - - -