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

Improve compatibility with luaj 1.0

Browse Source
This commit is contained in:
James Roseborough
2010-04-17 15:06:28 +00:00
parent ee098145c0
commit 6dfe984172
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/org/luaj/vm2/lib/PackageLib.java
View File

@@ -161,7 +161,8 @@ public class PackageLib extends OneArgFunction {
if ( ! value.istable() ) { /* not found? */ if ( ! value.istable() ) { /* not found? */
/* try global variable (and create one if it does not exist) */ /* try global variable (and create one if it does not exist) */
module = findtable( env, modname ); LuaValue globals = LuaThread.getGlobals();
module = findtable( globals, modname );
if ( module == null ) if ( module == null )
error( "name conflict for module '"+modname+"'" ); error( "name conflict for module '"+modname+"'" );
LOADED.set(modname, module); LOADED.set(modname, module);
@@ -283,7 +284,7 @@ public class PackageLib extends OneArgFunction {
LuaValue result = chunk.call(name); LuaValue result = chunk.call(name);
if ( ! result.isnil() ) if ( ! result.isnil() )
LOADED.set( name, result ); LOADED.set( name, result );
else if ( LOADED.get(name) == _SENTINEL ) else if ( (result = LOADED.get(name)) == _SENTINEL )
LOADED.set( name, result = LuaValue.TRUE ); LOADED.set( name, result = LuaValue.TRUE );
return result; return result;
} }

BIN
test/junit/org/luaj/vm2/vm1/luajvm1-tests.zip
View File

Binary file not shown.