diff options
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 8 | ||||
| -rw-r--r-- | util/serialization.lua (renamed from tools/serialize.lua) | 106 |
2 files changed, 65 insertions, 49 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 33f60c99..e66b8513 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -21,9 +21,9 @@ require "erlparse";
-require "serialize";
package.path = package.path ..";../?.lua";
+local serialize = require "util.serialization".serialize; local st = require "util.stanza";
package.loaded["util.logger"] = {init = function() return function() end; end}
local dm = require "util.datamanager"
@@ -74,7 +74,7 @@ function build_stanza(tuple, stanza) elseif tuple[1] == "xmlcdata" then
stanza:text(tuple[2]);
else
- error("unknown element type: "..serialize.serialize(tuple));
+ error("unknown element type: "..serialize(tuple));
end
end
function build_time(tuple)
@@ -190,7 +190,7 @@ for item in erlparse.parseFile(arg) do count = count + 1;
local name = item[1];
t[name] = (t[name] or 0) + 1;
- --print(count, serialize.serialize(item));
+ --print(count, serialize(item));
if filters[name] then filters[name](item); end
end
---print(serialize.serialize(t));
+--print(serialize(t));
diff --git a/tools/serialize.lua b/util/serialization.lua index 77c05e1b..a3147fd8 100644 --- a/tools/serialize.lua +++ b/util/serialization.lua @@ -17,49 +17,65 @@ -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- +local string_rep = string.rep; +local type = type; +local tostring = tostring; +local t_insert = table.insert; +local t_concat = table.concat; +local error = error; +local pairs = pairs; -
-local indent = function(i)
- return string.rep("\t", i);
-end
-local function basicSerialize (o)
- if type(o) == "number" or type(o) == "boolean" then
- return tostring(o);
- else -- assume it is a string -- FIXME make sure it's a string. throw an error otherwise.
- return (string.format("%q", tostring(o)):gsub("\\\n", "\\n"));
- end
-end
-local function _simplesave (o, ind, t)
- if type(o) == "number" then
- table.insert(t, tostring(o));
- elseif type(o) == "string" then
- table.insert(t, (string.format("%q", o):gsub("\\\n", "\\n")));
- elseif type(o) == "table" then
- table.insert(t, "{\n");
- for k,v in pairs(o) do
- table.insert(t, indent(ind));
- table.insert(t, "[");
- table.insert(t, basicSerialize(k));
- table.insert(t, "] = ");
- _simplesave(v, ind+1, t);
- table.insert(t, ",\n");
- end
- table.insert(t, indent(ind-1));
- table.insert(t, "}");
- elseif type(o) == "boolean" then
- table.insert(t, (o and "true" or "false"));
- else
- error("cannot serialize a " .. type(o))
- end
-end
-local t_concat = table.concat;
-
-module "serialize"
-
-function serialize(o)
- local t = {};
- _simplesave(o, 1, t);
- return t_concat(t);
-end
-
-return _M;
+module "serialization" + +local indent = function(i) + return string_rep("\t", i); +end +local function basicSerialize (o) + if type(o) == "number" or type(o) == "boolean" then + return tostring(o); + else -- assume it is a string -- FIXME make sure it's a string. throw an error otherwise. + return (("%q"):format(tostring(o)):gsub("\\\n", "\\n")); + end +end +local function _simplesave(o, ind, t, func) + if type(o) == "number" then + func(t, tostring(o)); + elseif type(o) == "string" then + func(t, (("%q"):format(o):gsub("\\\n", "\\n"))); + elseif type(o) == "table" then + func(t, "{\n"); + for k,v in pairs(o) do + func(t, indent(ind)); + func(t, "["); + func(t, basicSerialize(k)); + func(t, "] = "); + if ind == 0 then + _simplesave(v, 0, t, func); + else + _simplesave(v, ind+1, t, func); + end + func(t, ",\n"); + end + func(t, indent(ind-1)); + func(t, "}"); + elseif type(o) == "boolean" then + func(t, (o and "true" or "false")); + else + error("cannot serialize a " .. type(o)) + end +end + +function append(t, o) + _simplesave(o, 1, t, t.write or t_insert); + return t; +end + +function serialize(o) + return t_concat(append({}, o)); +end + +function deserialize(str) + error("Not implemented"); +end + +return _M; |