q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5d5185f9000a24b8f8a982c0076e45d5d2597d32
commit 5d5185f9000a24b8f8a982c0076e45d5d2597d32 Author: Daniel Kolesa <[email protected]> Date: Thu Aug 21 15:32:03 2014 +0100 elua: support for passing data to modules via require --- src/bin/elua/core/module.lua | 4 ++-- src/bin/elua/modules/lualian.lua | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/bin/elua/core/module.lua b/src/bin/elua/core/module.lua index aef7f71..0415480 100644 --- a/src/bin/elua/core/module.lua +++ b/src/bin/elua/core/module.lua @@ -86,12 +86,12 @@ local find_loader = function(modname, env) return nil, table.concat(err) end -M.require = function(modname) +M.require = function(modname, ...) local v = loaded[modname] if v ~= nil then return v end local loader, err = find_loader(modname) if not loader then error(err, 2) end - local ret = loader(modname) + local ret = loader(modname, ...) if ret ~= nil then loaded[modname] = ret return ret diff --git a/src/bin/elua/modules/lualian.lua b/src/bin/elua/modules/lualian.lua index 86cc9ab..9b664a2 100644 --- a/src/bin/elua/modules/lualian.lua +++ b/src/bin/elua/modules/lualian.lua @@ -558,7 +558,7 @@ local cutil = require("cutil") local util = require("util") local eo = require("eo") -local M = %s +local M = ... local __lib @@ -572,8 +572,7 @@ end cutil.init_module(init, shutdown) -]]):format(self.fname, self.klass:full_name_get(), modn, self.libname, - self.libname)) +]]):format(self.fname, self.klass:full_name_get(), self.libname, self.libname)) self:gen_children(s) --
