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

Improve compatibility with C-based lua.

Browse Source
This commit is contained in:
James Roseborough
2010-04-28 14:38:59 +00:00
parent 27bf60b903
commit 328a39007c
5 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/org/luaj/vm2/LuaError.java
View File

@@ -86,6 +86,7 @@ public class LuaError extends RuntimeException {
/** Add file and line info to a message */
private static String addFileLine( String message, int level ) {
if ( message == null ) return message;
LuaFunction f = LuaThread.getCallstackFunction(level);
return f!=null? f+": "+message: message;
}

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

@@ -37,22 +37,22 @@ public class PackageLib extends OneArgFunction {
public static String DEFAULT_LUA_PATH = "?.lua";
/** Most recent instance of PackageLib */
public static PackageLib instance;
public InputStream STDIN = null;
public PrintStream STDOUT = System.out;
public LuaTable LOADED;
public LuaTable PACKAGE;
/** Most recent instance of PackageLib */
public static PackageLib instance;
/** Loader that loads from preload table if found there */
public final LuaValue preload_loader;
public LuaValue preload_loader;
/** Loader that loads as a lua script using the LUA_PATH */
public final LuaValue lua_loader;
public LuaValue lua_loader;
/** Loader that loads as a Java class. Class must have public constructor and be a LuaValue */
public final LuaValue java_loader;
public LuaValue java_loader;
private static final LuaString _M = valueOf("_M");
private static final LuaString _NAME = valueOf("_NAME");
@@ -76,9 +76,6 @@ public class PackageLib extends OneArgFunction {
public PackageLib() {
instance = this;
preload_loader = new PkgLibV(env,"preload_loader", OP_PRELOAD_LOADER,this);
lua_loader = new PkgLibV(env,"lua_loader", OP_LUA_LOADER,this);
java_loader = new PkgLibV(env,"java_loader", OP_JAVA_LOADER,this);
}
public LuaValue call(LuaValue arg) {
@@ -91,9 +88,9 @@ public class PackageLib extends OneArgFunction {
_LOADLIB, new PkgLibV(env,"loadlib",OP_LOADLIB,this),
_SEEALL, new PkgLib1(env,"seeall",OP_SEEALL,this),
_LOADERS, listOf(new LuaValue[] {
preload_loader,
lua_loader,
java_loader,
preload_loader = new PkgLibV(env,"preload_loader", OP_PRELOAD_LOADER,this),
lua_loader = new PkgLibV(env,"lua_loader", OP_LUA_LOADER,this),
java_loader = new PkgLibV(env,"java_loader", OP_JAVA_LOADER,this),
}) }) );
return env;
}