Create common.serialize function

This commit is contained in:
Francesco Abbate 2020-12-30 13:32:25 +01:00
parent b0686bbe87
commit 0e263af3c6
3 changed files with 18 additions and 26 deletions

View File

@ -164,6 +164,20 @@ function common.bench(name, fn, ...)
end
function common.serialize(val)
if type(val) == "string" then
return string.format("%q", val)
elseif type(val) == "table" then
local t = {}
for k, v in pairs(val) do
table.insert(t, "[" .. common.serialize(k) .. "]=" .. common.serialize(v))
end
return "{" .. table.concat(t, ",") .. "}"
end
return tostring(val)
end
function common.home_encode(text)
if HOME then
local n = #HOME

View File

@ -11,15 +11,6 @@ local Doc
local core = {}
local function table_serialize(t)
local ls = {"{"}
for i = 1, #t do
ls[#ls + 1] = string.format(" %q,", t[i])
end
ls[#ls + 1] = "}"
return table.concat(ls, "\n")
end
local function load_projects()
local ok, t = pcall(dofile, USERDIR .. "/recent_projects.lua")
core.recent_projects = (ok and t or {})
@ -42,7 +33,7 @@ end
local function save_projects()
local fp = io.open(USERDIR .. "/recent_projects.lua", "w")
if fp then
fp:write("return ", table_serialize(core.recent_projects), "\n")
fp:write("return ", common.serialize(core.recent_projects), "\n")
fp:close()
end
end

View File

@ -1,23 +1,10 @@
local core = require "core"
local common = require "core.common"
local DocView = require "core.docview"
local workspace_filename = ".lite_workspace.lua"
local function serialize(val)
if type(val) == "string" then
return string.format("%q", val)
elseif type(val) == "table" then
local t = {}
for k, v in pairs(val) do
table.insert(t, "[" .. serialize(k) .. "]=" .. serialize(v))
end
return "{" .. table.concat(t, ",") .. "}"
end
return tostring(val)
end
local function has_no_locked_children(node)
if node.locked then return false end
if node.type == "leaf" then return true end
@ -164,8 +151,8 @@ local function save_workspace()
local root = get_unlocked_root(core.root_view.root_node)
local fp = io.open(workspace_filename, "w")
if fp then
local node_text = serialize(save_node(root))
local dir_text = serialize(save_directories())
local node_text = common.serialize(save_node(root))
local dir_text = common.serialize(save_directories())
fp:write(string.format("return { documents = %s, directories = %s }\n", node_text, dir_text))
fp:close()
end