open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix environment propogation from function to function.

Browse Source
This commit is contained in:
James Roseborough
2008-01-17 00:59:16 +00:00
parent 32d5e9c15e
commit f55a393fb8
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/org/luaj/vm/LuaState.java
View File

@@ -843,7 +843,7 @@ public class LuaState extends Lua {
case LuaState.OP_CLOSURE: { case LuaState.OP_CLOSURE: {
b = LuaState.GETARG_Bx(i); b = LuaState.GETARG_Bx(i);
proto = cl.p.p[b]; proto = cl.p.p[b];
newClosure = new LClosure(proto, _G); newClosure = new LClosure(proto, cl.env);
for (int j = 0; j < newClosure.upVals.length; j++, ci.pc++) { for (int j = 0; j < newClosure.upVals.length; j++, ci.pc++) {
i = code[ci.pc]; i = code[ci.pc];
o = LuaState.GET_OPCODE(i); o = LuaState.GET_OPCODE(i);

8
src/test/res/req/subsample.lua
View File

@@ -1,8 +1,16 @@
-- helper file for require() tests -- helper file for require() tests
require 'ids'
print( 'in subsample (before module statement)' )
print( 'env', id(getfenv()), '_G', id(_G), '_NAME', _NAME, '_M', id(_M), '_PACKAGE', _PACKAGE )
module( 'req.subsample', package.seeall ) module( 'req.subsample', package.seeall )
print( 'in subsample (after module statement)' )
print( 'env', id(getfenv()), '_G', id(_G), '_NAME', _NAME, '_M', id(_M), '_PACKAGE', _PACKAGE )
function h() function h()
print 'in subsample.h' print 'in subsample.h'
print( 'env', id(getfenv()), '_G', id(_G), '_NAME', _NAME, '_M', id(_M), '_PACKAGE', _PACKAGE )
end end
print 'loading subsample.lua' print 'loading subsample.lua'
h()
return 'return value from subsample', 'second return value from subsample' return 'return value from subsample', 'second return value from subsample'