From a1e0bc520daa720741a8f2967829af8bcf385313 Mon Sep 17 00:00:00 2001 From: James Roseborough Date: Thu, 5 Aug 2010 21:41:19 +0000 Subject: [PATCH] Improve bytecode generation. --- src/jse/org/luaj/vm2/luajc/Slots.java | 2 +- test/java/org/luaj/luajc/TestLuaJC.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jse/org/luaj/vm2/luajc/Slots.java b/src/jse/org/luaj/vm2/luajc/Slots.java index 5c9b592c..93c4c8a7 100644 --- a/src/jse/org/luaj/vm2/luajc/Slots.java +++ b/src/jse/org/luaj/vm2/luajc/Slots.java @@ -170,7 +170,7 @@ public class Slots { break; case Lua.OP_JMP: /* sBx pc+=sBx */ - if ( sbx < 0 ) + //if ( sbx < 0 ) branchdest[index+1+sbx] = true; ins = p.code[index+0+sbx]; if ( Lua.GET_OPCODE(ins) == Lua.OP_TFORLOOP ) { diff --git a/test/java/org/luaj/luajc/TestLuaJC.java b/test/java/org/luaj/luajc/TestLuaJC.java index 9e31251c..97113978 100644 --- a/test/java/org/luaj/luajc/TestLuaJC.java +++ b/test/java/org/luaj/luajc/TestLuaJC.java @@ -37,12 +37,12 @@ public class TestLuaJC { // create the script public static String name = "script"; public static String script = - "local a = unpack()\n"+ - "local b = c and { d = e }\n"+ - "local f\n"+ - "local function g()\n"+ - " return f\n"+ + "local t = a or nil\n"+ + "local t\n" + + "b = function()\n"+ + " return t\n"+ "end\n"+ + "return t\n"+ ""; public static void main(String[] args) throws Exception {