New "import" module to help tidy up all the local declarations at the top of modules

This commit is contained in:
Matthew Wild 2008-10-04 02:43:23 +01:00
parent 459665b368
commit 0f8ba47525
3 changed files with 19 additions and 6 deletions

View file

@ -1,11 +1,9 @@
local tonumber, tostring = tonumber, tostring;
local ipairs = ipairs;
local ipairs, print= ipairs, print;
local m_random = math.random;
local format = string.format;
local print = print;
local m_random = import("math", "random");
local format = import("string", "format");
local hosts = hosts;
@ -79,7 +77,7 @@ function streamopened(session, attr)
end
send("</stream:features>");
log("info", "core", "Stream opened successfully");
log("info", "Stream opened successfully");
session.notopen = nil;
end

View file

@ -13,6 +13,7 @@ dofile "lxmppd.cfg"
sessions = {};
require "util.import"
require "core.stanza_dispatch"
require "core.xmlhandlers"
require "core.rostermanager"
@ -24,6 +25,7 @@ require "core.stanza_router"
require "net.connhandlers"
require "util.stanza"
require "util.jid"
-- Locals for faster access --
local t_insert = table.insert;

13
util/import.lua Normal file
View file

@ -0,0 +1,13 @@
local t_insert = table.insert;
function import(module, ...)
local m = package.loaded[module] or require(module);
if type(m) == "table" and ... then
local ret = {};
for _, f in ipairs{...} do
t_insert(ret, m[f]);
end
return unpack(ret);
end
return m;
end