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

Fix xpcall arg check logic.

Browse Source
This commit is contained in:
James Roseborough
2010-04-15 14:35:05 +00:00
parent 576cf2068d
commit a77b93681f
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/org/luaj/vm2/Print.java
View File

@@ -330,6 +330,10 @@ public class Print extends Lua {
private static String id(Prototype f) {
return "Proto";
}
private void _assert(boolean b) {
if ( !b )
throw new NullPointerException("_assert failed");
}
public static void printState(LuaClosure cl, int pc, LuaValue[] stack, int top, Varargs varargs) {
// print opcode into buffer

16
src/core/org/luaj/vm2/lib/BaseLib.java
View File

@@ -137,7 +137,8 @@ public class BaseLib extends OneArgFunction implements ResourceFinder {
if ( arg == null )
LuaValue.argerror(1, "invalid level");
}
return arg.getfenv();
LuaValue e = arg.getfenv();
return e!=null? e: NIL;
}
case 1: // "getmetatable", // ( object ) -> table
LuaValue mt = arg.getmetatable();
@@ -252,13 +253,15 @@ public class BaseLib extends OneArgFunction implements ResourceFinder {
return varargsOf(FALSE, valueOf(m!=null? m: e.toString()));
}
case 6: // "xpcall", // (f, err) -> result1, ...
{
LuaValue errfunc = args.checkvalue(2);
try {
LuaThread.onCall(this);
try {
LuaThread thread = LuaThread.getRunning();
LuaValue olderr = thread.err;
try {
thread.err = args.arg(2);
thread.err = errfunc;
return varargsOf(LuaValue.TRUE, args.arg1().invoke(args.subargs(2)));
} finally {
thread.err = olderr;
@@ -266,11 +269,12 @@ public class BaseLib extends OneArgFunction implements ResourceFinder {
} finally {
LuaThread.onReturn();
}
} catch ( LuaError le ) {
String m = le.getMessage();
return varargsOf(FALSE, m!=null? valueOf(m): NIL);
} catch ( Exception e ) {
try {
return args.arg(2).invoke(valueOf(e.getMessage()));
} catch ( Exception f ) {
return varargsOf(FALSE, valueOf(f.getMessage()));
String m = e.getMessage();
return varargsOf(FALSE, valueOf(m!=null? m: e.toString()));
}
}
case 7: // "print", // (...) -> void

2
test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java
View File

@@ -29,6 +29,7 @@ import java.net.URL;
import junit.framework.TestCase;
import org.luaj.vm2.LuaThread;
import org.luaj.vm2.LuaValue;
/**
@@ -89,6 +90,7 @@ public class Luajvm1CompatibilityTest extends TestCase {
PrintStream printStream = new PrintStream( outputStream );
try {
org.luaj.vm2.LuaTable _G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
LuaThread.getRunning().setfenv(_G);
_G.get("package").get("loaders").checktable().insert(1, new org.luaj.vm2.lib.OneArgFunction(_G) {
public LuaValue call(LuaValue arg) {
String name = arg.toString();