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

Improve compatibility with vm1 and C-based lua.

Browse Source
This commit is contained in:
James Roseborough
2010-04-25 22:40:04 +00:00
parent 79b0294207
commit 29d6f2ce58
9 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/junit/org/luaj/vm2/ScriptDrivenTest.java
View File

@@ -60,7 +60,7 @@ public class ScriptDrivenTest extends TestCase {
default:
case JSE:
case LUAJIT:
_G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
_G = org.luaj.vm2.lib.JsePlatform.debugGlobals();
break;
case JME:
_G = org.luaj.vm2.lib.JmePlatform.debugGlobals();
@@ -115,7 +115,7 @@ public class ScriptDrivenTest extends TestCase {
}
default:
script = new FileInputStream(file);
return LoadState.load(script, "stdin", _G);
return LoadState.load(script, "=stdin", _G);
}
} catch ( Exception e ) {
e.printStackTrace();

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

@@ -92,7 +92,7 @@ public class Luajvm1CompatibilityTest extends TestCase {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
PrintStream printStream = new PrintStream( outputStream );
try {
org.luaj.vm2.LuaTable _G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
org.luaj.vm2.LuaTable _G = org.luaj.vm2.lib.JsePlatform.debugGlobals();
LuaThread.getRunning().setfenv(_G);
_G.get("package").get("loaders").checktable().insert(1, new org.luaj.vm2.lib.OneArgFunction(_G) {
public LuaValue call(LuaValue arg) {

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

Binary file not shown.

8
test/lua/debuglib.lua
View File

@@ -114,8 +114,8 @@ print( 'get='..tostring(s4)..','..tostring(x4==nil)..','..tostring(y4) )
print( 'set='..tostring(s5)..','..tostring(x5==a)..','..tostring(y5) )
print( 'get='..tostring(s6)..','..tostring(x6==nil)..','..tostring(y6) )
print( pcall( debug.getmetatable, 1 ) )
-- print( pcall( debug.setmetatable, 1, {} ) )
-- print( pcall( debug.setmetatable, 1, nil ) )
print( pcall( debug.setmetatable, 1, {} ) )
print( pcall( debug.setmetatable, 1, nil ) )
print( '----- debug.getinfo' )
local printfield = function(tbl, field)
@@ -126,10 +126,6 @@ local printfield = function(tbl, field)
x = '{'..table.concat(x,',')..'}'
elseif typ=='function' then
x = typ
elseif typ=='string' then
if field == 'source' then
x = x:sub(2)
end
end
print( ' '..field..': '..tostring(x) )
end