projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
util
/
serialization.lua
diff --git
a/util/serialization.lua
b/util/serialization.lua
index 049011356cbbe0c9c892d89b9e79745df3d40a64..206f5fbbf59bda7766172dfb8cc6e3dceaf5c0a3 100644
(file)
--- a/
util/serialization.lua
+++ b/
util/serialization.lua
@@
-20,7
+20,7
@@
local debug_traceback = debug.traceback;
local log = require "util.logger".init("serialization");
local envload = require"util.envload".envload;
local log = require "util.logger".init("serialization");
local envload = require"util.envload".envload;
-module "serialization"
+local _ENV = nil;
local indent = function(i)
return string_rep("\t", i);
local indent = function(i)
return string_rep("\t", i);
@@
-71,16
+71,16
@@
local function _simplesave(o, ind, t, func)
end
end
end
end
-function append(t, o)
+
local
function append(t, o)
_simplesave(o, 1, t, t.write or t_insert);
return t;
end
_simplesave(o, 1, t, t.write or t_insert);
return t;
end
-function serialize(o)
+
local
function serialize(o)
return t_concat(append({}, o));
end
return t_concat(append({}, o));
end
-function deserialize(str)
+
local
function deserialize(str)
if type(str) ~= "string" then return nil; end
str = "return "..str;
local f, err = envload(str, "@data", {});
if type(str) ~= "string" then return nil; end
str = "return "..str;
local f, err = envload(str, "@data", {});
@@
-90,4
+90,8
@@
function deserialize(str)
return ret;
end
return ret;
end
-return _M;
+return {
+ append = append;
+ serialize = serialize;
+ deserialize = deserialize;
+};