util.session: What is the identity of a session?

[prosody.git] / util / serialization.lua

diff --git a/util/serialization.lua b/util/serialization.lua
index 07a099c910533cc1c95df93fc19fcb7a679dfda6..206f5fbbf59bda7766172dfb8cc6e3dceaf5c0a3 100644 (file)
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
--- 
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -11,31 +11,40 @@ local type = type;
 local tostring = tostring;
 local t_insert = table.insert;
 local t_concat = table.concat;
-local error = error;
 local pairs = pairs;
 local next = next;
 
+local pcall = pcall;
+
 local debug_traceback = debug.traceback;
 local log = require "util.logger".init("serialization");
-module "serialization"
+local envload = require"util.envload".envload;
+
+local _ENV = nil;
 
 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);
+               -- no need to check for NaN, as that's not a valid table index
+               if o == 1/0 then return "(1/0)";
+               elseif o == -1/0 then return "(-1/0)";
+               else return tostring(o); end
        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));
+               if o ~= o then func(t, "(0/0)");
+               elseif o == 1/0 then func(t, "(1/0)");
+               elseif o == -1/0 then func(t, "(-1/0)");
+               else func(t, tostring(o)); end
        elseif type(o) == "string" then
                func(t, (("%q"):format(o):gsub("\\\n", "\\n")));
        elseif type(o) == "table" then
-               if next(o) then
+               if next(o) ~= nil then
                        func(t, "{\n");
                        for k,v in pairs(o) do
                                func(t, indent(ind));
@@ -62,17 +71,27 @@ local function _simplesave(o, ind, t, func)
        end
 end
 
-function append(t, o)
+local function append(t, o)
        _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
 
-function deserialize(str)
-       error("Not implemented");
+local function deserialize(str)
+       if type(str) ~= "string" then return nil; end
+       str = "return "..str;
+       local f, err = envload(str, "@data", {});
+       if not f then return nil, err; end
+       local success, ret = pcall(f);
+       if not success then return nil, ret; end
+       return ret;
 end
 
-return _M;
+return {
+       append = append;
+       serialize = serialize;
+       deserialize = deserialize;
+};