mirrors/etlua
1
0
Fork 0
mirror of https://github.com/TangentFoxy/etlua.git synced 2025-07-28 02:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

split @load apart, add @run

Browse Source
This commit is contained in:
leaf corcoran
2014-02-01 11:59:22 -08:00
parent 8b67327708
commit f2a819b7f4
2 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
etlua.lua
View File

@@ -169,7 +169,14 @@ do
if not (success) then
return nil, err
end
return self:load(self:chunks_to_lua())
local fn
fn, err = self:load(self:chunks_to_lua())
if not (fn) then
return nil, err
end
return function(...)
return self:run(fn, ...)
end
end,
parse = function(self, str)
self.str = str
@@ -230,25 +237,26 @@ do
end
return nil, err
end
return function(env, buffer)
if env == nil then
env = { }
end
if buffer == nil then
buffer = { }
end
local combined_env = setmetatable({ }, {
__index = function(self, name)
local val = env[name]
if val == nil then
val = _G[name]
end
return val
end
})
setfenv(fn, combined_env)
return fn(buffer, #buffer, tostring, concat, html_escape)
return fn
end,
run = function(self, fn, env, buffer)
if env == nil then
env = { }
end
if buffer == nil then
buffer = { }
end
local combined_env = setmetatable({ }, {
__index = function(self, name)
local val = env[name]
if val == nil then
val = _G[name]
end
return val
end
})
setfenv(fn, combined_env)
return fn(buffer, #buffer, tostring, concat, html_escape)
end,
chunks_to_lua = function(self)
local buffer = {