2018-06-24 22:33:00 +02:00
|
|
|
--[[
|
|
|
|
|
|
|
|
SaferLua [safer_lua]
|
|
|
|
====================
|
|
|
|
|
|
|
|
Copyright (C) 2018 Joachim Stolberg
|
|
|
|
|
|
|
|
LGPLv2.1+
|
|
|
|
See LICENSE.txt for more information
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
data_struct.lua:
|
|
|
|
|
|
|
|
see https://github.com/joe7575/techpack/wiki/Data-Structures
|
2018-06-24 22:33:00 +02:00
|
|
|
|
|
|
|
]]--
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
safer_lua.DataStructHelp = [[
|
|
|
|
Data structures as a secure shell over the LUA table type.
|
|
|
|
see https://github.com/joe7575/techpack/wiki/Data-Structures
|
|
|
|
|
|
|
|
'Arrays' are lists of elements, which can be addressed
|
|
|
|
by means of an index:
|
2018-06-24 15:01:33 +02:00
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
a = Array(1,2,3,4) --> {1,2,3,4}
|
|
|
|
a.add(6) --> {1,2,3,4,6}
|
|
|
|
a.set(2, 8) --> {1,8,3,4,6}
|
|
|
|
a.insert(5,7) --> {1,8,3,4,7,6}
|
|
|
|
a.remove(3) --> {1,8,4,7,6}
|
|
|
|
a.insert(1, "hello") --> {"hello",1,8,4,7,6}
|
2018-06-30 13:48:48 +02:00
|
|
|
a.size() --> function returns 6
|
2018-07-01 12:34:55 +02:00
|
|
|
a.memsize() --> return returns 10
|
2018-06-30 16:04:55 +02:00
|
|
|
a.next() --> for loop iterator function
|
2018-07-01 12:34:55 +02:00
|
|
|
a.sort(reverse) --> sort the array elements in place
|
2018-06-30 00:23:18 +02:00
|
|
|
|
|
|
|
Unlike arrays, which are indexed by a range of numbers,
|
|
|
|
'stores' are indexed by keys:
|
2018-06-24 15:01:33 +02:00
|
|
|
|
2019-01-15 20:25:13 +01:00
|
|
|
s = Store("a",4,"b",5) --> {a = 4, b = 5}
|
|
|
|
s.set("val", 12) --> {a = 4, b = 5, val = 12}
|
2018-06-30 00:23:18 +02:00
|
|
|
s.get("val") --> returns 12
|
2019-01-15 20:25:13 +01:00
|
|
|
s.set(0, "hello") --> {a = 4, b = 5, val = 12, [0] = "hello"}
|
2018-06-30 00:23:18 +02:00
|
|
|
s.del("val") --> {[0] = "hello"}
|
2019-01-15 20:25:13 +01:00
|
|
|
s.size() --> function returns 4
|
|
|
|
s.memsize() --> function returns 8
|
2018-06-30 16:04:55 +02:00
|
|
|
s.next() --> for loop iterator function
|
2018-07-01 12:34:55 +02:00
|
|
|
s.keys(order) --> return an array with the keys
|
2018-06-30 00:23:18 +02:00
|
|
|
|
|
|
|
A 'set' is an unordered collection with no duplicate
|
|
|
|
elements.
|
2018-06-24 15:01:33 +02:00
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
s = Set("Tom", "Lucy")
|
|
|
|
--> {Tom = true, Lucy = true}
|
|
|
|
s.del("Tom") --> {Lucy = true}
|
|
|
|
s.add("Susi") --> {Lucy = true, Susi = true}
|
|
|
|
s.has("Susi") --> function returns `true`
|
|
|
|
s.has("Mike") --> function returns `false`
|
2018-06-30 13:48:48 +02:00
|
|
|
s.size() --> function returns 2
|
2018-07-01 12:34:55 +02:00
|
|
|
s.memsize() --> function returns 8
|
2018-06-30 16:04:55 +02:00
|
|
|
s.next() --> for loop iterator function
|
2018-06-24 15:01:33 +02:00
|
|
|
]]
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
local function var_count(v)
|
|
|
|
if type(v) == "number" then
|
|
|
|
return 1
|
|
|
|
elseif type(v) == "boolean" then
|
|
|
|
return 1
|
|
|
|
elseif v == nil then
|
|
|
|
return 0
|
|
|
|
elseif type(v) == "string" then
|
|
|
|
return #v
|
|
|
|
elseif type(v) == "table" then
|
2018-06-30 13:48:48 +02:00
|
|
|
return v.memsize()
|
2018-06-30 00:23:18 +02:00
|
|
|
else
|
|
|
|
return nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
2019-01-15 20:25:13 +01:00
|
|
|
function safer_lua.Store(...)
|
2018-06-24 15:01:33 +02:00
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
local new_t = {}
|
2018-06-24 15:01:33 +02:00
|
|
|
local mt = {}
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
local MemSize = 0
|
|
|
|
local Size = 0
|
|
|
|
local Data = {}
|
2018-06-24 15:01:33 +02:00
|
|
|
|
|
|
|
mt.__newindex = function(t, k, v) return end
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
mt.count = var_count
|
2018-06-24 15:01:33 +02:00
|
|
|
|
|
|
|
new_t.set = function(k,v)
|
2018-06-26 23:04:25 +02:00
|
|
|
if type(k) == "number" then
|
2018-06-30 13:48:48 +02:00
|
|
|
if rawget(Data, k) then -- has entry?
|
|
|
|
MemSize = MemSize - mt.count(rawget(Data, k))
|
|
|
|
else
|
|
|
|
Size = Size + 1
|
|
|
|
end
|
|
|
|
MemSize = MemSize + mt.count(v)
|
|
|
|
rawset(Data, k, v)
|
2018-06-26 23:04:25 +02:00
|
|
|
elseif type(k) == "string" then
|
2018-06-30 13:48:48 +02:00
|
|
|
if rawget(Data, k) then -- has entry?
|
|
|
|
MemSize = MemSize - mt.count(rawget(Data, k))
|
2018-06-30 00:23:18 +02:00
|
|
|
else
|
2018-06-30 13:48:48 +02:00
|
|
|
MemSize = MemSize + mt.count(k)
|
|
|
|
Size = Size + 1
|
2018-06-24 15:01:33 +02:00
|
|
|
end
|
2018-06-30 13:48:48 +02:00
|
|
|
MemSize = MemSize + mt.count(v)
|
|
|
|
rawset(Data, k, v)
|
2018-06-24 15:01:33 +02:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
new_t.get = function(k)
|
2018-06-30 13:48:48 +02:00
|
|
|
return rawget(Data, k)
|
2018-06-24 15:01:33 +02:00
|
|
|
end
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
new_t.del = function(k)
|
2018-06-30 13:48:48 +02:00
|
|
|
if rawget(Data, k) then -- has entry?
|
|
|
|
MemSize = MemSize - mt.count(k)
|
|
|
|
MemSize = MemSize - mt.count(rawget(Data, k))
|
|
|
|
rawset(Data, k, nil)
|
|
|
|
Size = Size - 1
|
|
|
|
end
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
new_t.memsize = function(t)
|
|
|
|
return MemSize
|
|
|
|
end
|
|
|
|
|
2018-06-24 15:01:33 +02:00
|
|
|
new_t.size = function(t)
|
2018-06-30 13:48:48 +02:00
|
|
|
return Size
|
2018-06-24 15:01:33 +02:00
|
|
|
end
|
|
|
|
|
2018-06-30 16:04:55 +02:00
|
|
|
new_t.next = function(t)
|
|
|
|
local n = nil
|
|
|
|
return function ()
|
|
|
|
n = next(Data, n)
|
|
|
|
if n then return n, Data[n] end
|
|
|
|
end
|
|
|
|
end
|
2018-07-01 12:34:55 +02:00
|
|
|
|
|
|
|
new_t.keys = function(order)
|
|
|
|
local keyset = {}
|
|
|
|
local n = 0
|
|
|
|
local size = 0
|
|
|
|
|
|
|
|
for k,v in pairs(Data) do
|
|
|
|
n = n + 1
|
|
|
|
keyset[n] = k
|
|
|
|
size = size + var_count(k)
|
|
|
|
end
|
|
|
|
|
|
|
|
if order == "up" then
|
|
|
|
table.sort(keyset, function(a,b) return a > b end)
|
|
|
|
elseif order == "down" then
|
|
|
|
table.sort(keyset)
|
|
|
|
end
|
|
|
|
local a = safer_lua.Array()
|
|
|
|
a.__load(size, keyset)
|
|
|
|
return a
|
|
|
|
end
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
new_t.__dump = function()
|
|
|
|
-- remove the not serializable meta data
|
|
|
|
return {Type = "Store", Size = Size, MemSize = MemSize, Data = Data}
|
|
|
|
end
|
|
|
|
|
|
|
|
new_t.__load = function(size, memsize, data)
|
|
|
|
Size = size
|
|
|
|
MemSize = memsize
|
|
|
|
Data = data
|
2018-06-26 23:04:25 +02:00
|
|
|
end
|
2018-06-30 00:23:18 +02:00
|
|
|
|
2019-01-15 20:25:13 +01:00
|
|
|
for idx = 1,select('#',...),2 do
|
|
|
|
local k,v = select(idx,...),select(idx+1,...)
|
|
|
|
new_t.set(k,v)
|
|
|
|
end
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
return setmetatable(new_t, mt)
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
function safer_lua.Array(...)
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
local new_t = {}
|
2018-06-30 00:23:18 +02:00
|
|
|
local mt = {}
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
local MemSize = 0
|
|
|
|
local Data = {}
|
2018-06-30 00:23:18 +02:00
|
|
|
|
|
|
|
mt.__newindex = function(t, k, v) return end
|
|
|
|
|
|
|
|
mt.count = var_count
|
|
|
|
|
|
|
|
for idx = 1,select('#',...) do
|
|
|
|
local v = select(idx,...)
|
2018-06-24 15:01:33 +02:00
|
|
|
local cnt = mt.count(v)
|
2018-06-30 00:23:18 +02:00
|
|
|
if cnt then
|
2018-06-30 13:48:48 +02:00
|
|
|
MemSize = MemSize + cnt
|
|
|
|
rawset(Data, idx, v)
|
2018-06-24 15:01:33 +02:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
new_t.add = function(v)
|
2018-06-30 13:48:48 +02:00
|
|
|
MemSize = MemSize + mt.count(v)
|
|
|
|
local i = #Data + 1
|
|
|
|
table.insert(Data, i, v)
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
new_t.set = function(i,v)
|
2018-06-30 13:48:48 +02:00
|
|
|
i = math.min(#Data, i)
|
|
|
|
MemSize = MemSize - mt.count(rawget(Data, i))
|
|
|
|
MemSize = MemSize + mt.count(v)
|
|
|
|
rawset(Data, i, v)
|
|
|
|
end
|
|
|
|
|
|
|
|
new_t.get = function(i)
|
|
|
|
return Data[i]
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
new_t.insert = function(i, v)
|
2018-06-30 13:48:48 +02:00
|
|
|
MemSize = MemSize + mt.count(v)
|
|
|
|
i = math.min(#Data, i)
|
|
|
|
table.insert(Data, i, v)
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
|
2018-06-24 15:01:33 +02:00
|
|
|
new_t.remove = function(i)
|
2018-06-30 13:48:48 +02:00
|
|
|
local v = table.remove(Data, i)
|
|
|
|
MemSize = MemSize - mt.count(v)
|
2018-06-24 15:01:33 +02:00
|
|
|
return v
|
|
|
|
end
|
|
|
|
|
2018-07-01 12:34:55 +02:00
|
|
|
new_t.sort = function(reverse)
|
|
|
|
if reverse then
|
|
|
|
table.sort(Data, function(a,b) return a > b end)
|
|
|
|
else
|
|
|
|
table.sort(Data)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
new_t.memsize = function(t)
|
|
|
|
return MemSize
|
|
|
|
end
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
new_t.size = function(t)
|
2018-06-30 13:48:48 +02:00
|
|
|
return #Data
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
|
2018-06-30 16:04:55 +02:00
|
|
|
new_t.next = function(t)
|
|
|
|
local i = 0
|
|
|
|
local n = #Data
|
|
|
|
return function ()
|
|
|
|
i = i + 1
|
|
|
|
if i <= n then return i, Data[i] end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
new_t.__dump = function()
|
|
|
|
-- remove the not serializable meta data
|
|
|
|
return {Type = "Array", MemSize = MemSize, Data = Data}
|
|
|
|
end
|
|
|
|
|
|
|
|
new_t.__load = function(memsize, data)
|
|
|
|
MemSize = memsize
|
|
|
|
Data = data
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
return setmetatable(new_t, mt)
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
function safer_lua.Set(...)
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
local new_t = {}
|
2018-06-30 00:23:18 +02:00
|
|
|
local mt = {}
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
local MemSize = 0
|
|
|
|
local Size = 0
|
|
|
|
local Data = {}
|
2018-06-30 00:23:18 +02:00
|
|
|
|
|
|
|
mt.__newindex = function(t, k, v) return end
|
|
|
|
|
|
|
|
mt.count = var_count
|
|
|
|
|
|
|
|
for idx = 1,select('#',...) do
|
|
|
|
local v = select(idx,...)
|
|
|
|
local cnt = mt.count(v)
|
|
|
|
if cnt then
|
2018-06-30 13:48:48 +02:00
|
|
|
MemSize = MemSize + cnt
|
|
|
|
Size = Size + 1
|
|
|
|
rawset(Data, v, true)
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
new_t.add = function(k)
|
2018-06-30 13:48:48 +02:00
|
|
|
MemSize = MemSize + mt.count(k)
|
|
|
|
rawset(Data, k, true)
|
|
|
|
Size = Size + 1
|
2018-06-24 15:01:33 +02:00
|
|
|
end
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
new_t.del = function(k)
|
2018-06-30 13:48:48 +02:00
|
|
|
MemSize = MemSize - mt.count(k)
|
|
|
|
rawset(Data, k, nil)
|
|
|
|
Size = Size - 1
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
|
|
|
|
new_t.has = function(k)
|
2018-06-30 13:48:48 +02:00
|
|
|
return rawget(Data, k) == true
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
new_t.memsize = function(t)
|
|
|
|
return MemSize
|
|
|
|
end
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
new_t.size = function(t)
|
2018-06-30 13:48:48 +02:00
|
|
|
return Size
|
2018-06-30 00:23:18 +02:00
|
|
|
end
|
|
|
|
|
2018-06-30 16:04:55 +02:00
|
|
|
new_t.next = function(t)
|
|
|
|
local i = 0
|
|
|
|
local n = nil
|
|
|
|
return function ()
|
|
|
|
i = i + 1
|
|
|
|
n = next(Data, n)
|
|
|
|
if n then return i, n end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-06-30 13:48:48 +02:00
|
|
|
new_t.__dump = function()
|
|
|
|
-- remove the not serializable meta data
|
|
|
|
return {Type = "Set", Size = Size, MemSize = MemSize, Data = Data}
|
2018-06-24 15:01:33 +02:00
|
|
|
end
|
2018-06-30 13:48:48 +02:00
|
|
|
|
|
|
|
new_t.__load = function(size, memsize, data)
|
|
|
|
Size = size
|
|
|
|
MemSize = memsize
|
|
|
|
Data = data
|
|
|
|
end
|
|
|
|
|
2018-06-30 00:23:18 +02:00
|
|
|
return setmetatable(new_t, mt)
|
2018-06-24 15:01:33 +02:00
|
|
|
end
|
2018-06-30 13:48:48 +02:00
|
|
|
|
|
|
|
|
|
|
|
-- remove the not serializable meta data
|
|
|
|
function safer_lua.datastruct_to_table(ds)
|
|
|
|
return ds.__dump()
|
|
|
|
end
|
|
|
|
|
|
|
|
-- add the not serializable meta data again
|
|
|
|
function safer_lua.table_to_datastruct(tbl)
|
|
|
|
if tbl.Type == "Store" then
|
|
|
|
local s = safer_lua.Store()
|
|
|
|
s.__load(tbl.Size, tbl.MemSize, tbl.Data)
|
|
|
|
return s
|
|
|
|
elseif tbl.Type == "Set" then
|
|
|
|
local s = safer_lua.Set()
|
|
|
|
s.__load(tbl.Size, tbl.MemSize, tbl.Data)
|
|
|
|
return s
|
|
|
|
elseif tbl.Type == "Array" then
|
|
|
|
local a = safer_lua.Array()
|
|
|
|
a.__load(tbl.MemSize, tbl.Data)
|
|
|
|
return a
|
|
|
|
end
|
|
|
|
end
|