mod_adhoc: Add support for commands only executable by global administrators

[prosody.git] / util / serialization.lua

diff --git a/util/serialization.lua b/util/serialization.lua
index 7a377c980552334324abcff8ba428f559ed41e17..e193b64f7ff70e8683ef06cfafa365cefbcd65f3 100644 (file)
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -1,20 +1,9 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 local string_rep = string.rep;
@@ -24,7 +13,14 @@ local t_insert = table.insert;
 local t_concat = table.concat;
 local error = error;
 local pairs = pairs;
+local next = next;
+
+local loadstring = loadstring;
+local setfenv = setfenv;
+local pcall = pcall;
 
+local debug_traceback = debug.traceback;
+local log = require "util.logger".init("serialization");
 module "serialization"
 
 local indent = function(i)
@@ -32,36 +28,47 @@ local indent = function(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
-               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);
+               if next(o) ~= nil 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, ",\n");
+                       func(t, indent(ind-1));
+                       func(t, "}");
+               else
+                       func(t, "{}");
                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))
+               log("error", "cannot serialize a %s: %s", type(o), debug_traceback())
+               func(t, "nil");
        end
 end
 
@@ -75,7 +82,14 @@ function serialize(o)
 end
 
 function deserialize(str)
-       error("Not implemented");
+       if type(str) ~= "string" then return nil; end
+       str = "return "..str;
+       local f, err = loadstring(str, "@data");
+       if not f then return nil, err; end
+       setfenv(f, {});
+       local success, ret = pcall(f);
+       if not success then return nil, ret; end
+       return ret;
 end
 
 return _M;