From 0f70a8e96238615d9cae26934f1aa3a00e2f2321 Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Wed, 19 Sep 2012 03:19:55 +0000
Subject: [PATCH] Fixes to luajc bytecode generation.

---
 src/core/org/luaj/vm2/LuaClosure.java         |  2 --
 src/core/org/luaj/vm2/LuaValue.java           |  5 +----
 src/jse/org/luaj/vm2/luajc/LuaJC.java         | 11 ++++++-----
 src/jse/org/luaj/vm2/luajc/ProtoInfo.java     |  8 ++++++--
 src/jse/org/luaj/vm2/luajc/UpvalInfo.java     |  9 ++++++---
 test/java/org/luaj/luajc/TestLuaJC.java       | 10 +++++-----
 test/junit/org/luaj/vm2/CompatibiltyTest.java | 10 +++++-----
 test/junit/org/luaj/vm2/FragmentsTest.java    | 10 ++++++++++
 test/junit/org/luaj/vm2/ScriptDrivenTest.java |  3 +++
 test/lua/errors/debuglibargs.lua              |  2 +-
 10 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/core/org/luaj/vm2/LuaClosure.java b/src/core/org/luaj/vm2/LuaClosure.java
index 1b059150..7575d7ee 100644
--- a/src/core/org/luaj/vm2/LuaClosure.java
+++ b/src/core/org/luaj/vm2/LuaClosure.java
@@ -21,8 +21,6 @@
 ******************************************************************************/
 package org.luaj.vm2;
 
-import org.luaj.vm2.lib.DebugLib;
-
 /**
  * Extension of {@link LuaFunction} which executes lua bytecode. 
  * <p>
diff --git a/src/core/org/luaj/vm2/LuaValue.java b/src/core/org/luaj/vm2/LuaValue.java
index 913d417c..8f964d01 100644
--- a/src/core/org/luaj/vm2/LuaValue.java
+++ b/src/core/org/luaj/vm2/LuaValue.java
@@ -21,9 +21,6 @@
 ******************************************************************************/
 package org.luaj.vm2;
 
-import org.luaj.vm2.Varargs.SubVarargs;
-
-
 /**
  * Base class for all concrete lua type values.  
  * <p>
@@ -432,7 +429,7 @@ public class LuaValue extends Varargs {
 	 */
 	public boolean isuserdata(Class c)   { return false; }
 	
-	/** Convert to boolean false if {@link #NIL} or {@link FALSE}, true if anything else
+	/** Convert to boolean false if {@link #NIL} or {@link #FALSE}, true if anything else
 	 * @return Value cast to byte if number or string convertible to number, otherwise 0
 	 * @see #optboolean(boolean)
 	 * @see #checkboolean() 
diff --git a/src/jse/org/luaj/vm2/luajc/LuaJC.java b/src/jse/org/luaj/vm2/luajc/LuaJC.java
index 8e09e98f..fa6f82f4 100644
--- a/src/jse/org/luaj/vm2/luajc/LuaJC.java
+++ b/src/jse/org/luaj/vm2/luajc/LuaJC.java
@@ -105,11 +105,12 @@ public class LuaJC implements LuaCompiler {
 	
 	private static String toStandardJavaClassName( String luachunkname ) {
 		String stub = toStub( luachunkname );
-		String classname = stub.replace('/','.').replaceAll(NON_IDENTIFIER, "_");
-		int c = classname.charAt(0);
-		if ( c!='_' && !Character.isJavaIdentifierStart(c) )
-			classname = "_"+classname;
-		return classname;
+		StringBuffer classname = new StringBuffer();
+		for (int i = 0, n = stub.length(); i < n; ++i) {
+			final char c = stub.charAt(i);
+			classname.append((((i == 0) && Character.isJavaIdentifierStart(c)) || ((i > 0) && Character.isJavaIdentifierPart(c)))? c: '_');
+		}
+		return classname.toString();
 	}
 	
 	private static String toStandardLuaFileName( String luachunkname ) {
diff --git a/src/jse/org/luaj/vm2/luajc/ProtoInfo.java b/src/jse/org/luaj/vm2/luajc/ProtoInfo.java
index 5bfa9dad..1b1ab08d 100644
--- a/src/jse/org/luaj/vm2/luajc/ProtoInfo.java
+++ b/src/jse/org/luaj/vm2/luajc/ProtoInfo.java
@@ -26,13 +26,13 @@ public class ProtoInfo {
 	// A main chunk proto info.
 	public ProtoInfo(Prototype p, String name) {
 		// For the outer chunk, we have one upvalue which is the environment.
-		this(p,name,new UpvalInfo[] { new UpvalInfo() });
+		this(p,name,null);
 	}
 	
 	private ProtoInfo(Prototype p, String name, UpvalInfo[] u) {
 		this.name = name;
 		this.prototype = p;
-		this.upvals = u;
+		this.upvals = u != null? u: new UpvalInfo[] { new UpvalInfo(this) };
 		this.subprotos = p.p!=null&&p.p.length>0? new ProtoInfo[p.p.length]: null;
 		
 		// find basic blocks
@@ -364,6 +364,10 @@ public class ProtoInfo {
 					break;
 
 				case Lua.OP_JMP: /*	sBx	pc+=sBx					*/
+					a = Lua.GETARG_A( ins );
+					if (a > 0)
+						for ( --a; a<m; a++ )
+							v[a][pc] = VarInfo.INVALID;
 					break;
 	
 				default:
diff --git a/src/jse/org/luaj/vm2/luajc/UpvalInfo.java b/src/jse/org/luaj/vm2/luajc/UpvalInfo.java
index 8719c0c5..10e2368f 100644
--- a/src/jse/org/luaj/vm2/luajc/UpvalInfo.java
+++ b/src/jse/org/luaj/vm2/luajc/UpvalInfo.java
@@ -13,9 +13,12 @@ public class UpvalInfo {
 	boolean rw;     // read-write
 
 	// Upval info representing the implied context containing only the environment.
-	public UpvalInfo() {
-		nvars = 1;
-		var = new VarInfo[] { VarInfo.PARAM(0) };
+	public UpvalInfo(ProtoInfo pi) {
+		this.pi = pi;
+		this.slot = 0;
+		this.nvars = 1;
+		this.var = new VarInfo[] { VarInfo.PARAM(0) };
+		this.rw = false;
 	}
 
 	public UpvalInfo(ProtoInfo pi, int pc, int slot) {
diff --git a/test/java/org/luaj/luajc/TestLuaJC.java b/test/java/org/luaj/luajc/TestLuaJC.java
index 609dfe2b..d904cb0e 100644
--- a/test/java/org/luaj/luajc/TestLuaJC.java
+++ b/test/java/org/luaj/luajc/TestLuaJC.java
@@ -39,11 +39,11 @@ import org.luaj.vm2.luajc.LuaJC;
 public class TestLuaJC {
 	// create the script
 	public static String name = "script";
-	public static String script =
-			"for n,p in ipairs({77}) do\n"+
-			"	print('n,p',n,p)\n"+
-			"end\n";
-		
+	public static String script = 
+			"function f1(a) print( 'f1:', a ) return a end\n" +
+					"b = f1()\n" + 
+					"return b";
+
 	public static void main(String[] args) throws Exception {
 		System.out.println(script);
 		try {
diff --git a/test/junit/org/luaj/vm2/CompatibiltyTest.java b/test/junit/org/luaj/vm2/CompatibiltyTest.java
index a1ffce16..2f0eadf5 100644
--- a/test/junit/org/luaj/vm2/CompatibiltyTest.java
+++ b/test/junit/org/luaj/vm2/CompatibiltyTest.java
@@ -76,9 +76,9 @@ public class CompatibiltyTest extends TestSuite {
 
 	public static TestSuite suite() {
 		TestSuite suite = new TestSuite("Compatibility Tests");
-		suite.addTest( new TestSuite( JseCompatibilityTest.class,   "JSE Tests" ) );
-		suite.addTest( new TestSuite( JmeCompatibilityTest.class,   "JME Tests" ) );
-		suite.addTest( new TestSuite( LuaJCTest.class,        "JSE Bytecode Tests" ) );
+		suite.addTest( new TestSuite( JseCompatibilityTest.class,   "JSE Compatibility Tests" ) );
+		suite.addTest( new TestSuite( JmeCompatibilityTest.class,   "JME Compatibility Tests" ) );
+		suite.addTest( new TestSuite( LuaJCCompatibilityTest.class,        "LuaJC Compatibility Tests" ) );
 		return suite;
 	}
 	
@@ -100,8 +100,8 @@ public class CompatibiltyTest extends TestSuite {
 			System.setProperty("JME", "false");
 		}
 	}
-	public static class LuaJCTest extends CompatibiltyTestSuite {
-		public LuaJCTest() {
+	public static class LuaJCCompatibilityTest extends CompatibiltyTestSuite {
+		public LuaJCCompatibilityTest() {
 			super(ScriptDrivenTest.PlatformType.LUAJIT);
 		}
 		protected void setUp() throws Exception {
diff --git a/test/junit/org/luaj/vm2/FragmentsTest.java b/test/junit/org/luaj/vm2/FragmentsTest.java
index 73881928..9a7b410b 100644
--- a/test/junit/org/luaj/vm2/FragmentsTest.java
+++ b/test/junit/org/luaj/vm2/FragmentsTest.java
@@ -545,5 +545,15 @@ public class FragmentsTest extends TestSuite {
 			        "    end\n" +
 			        "end\n");
 		}
+		
+		public void testUpvalueInDoBlock() {
+			runFragment( LuaValue.NONE, "do\n"+
+					"	local x = 10\n"+
+					"	function g()\n"+
+					"		return x\n"+
+					"	end\n"+
+					"end\n"+
+					"g()\n");
+		}
 	}
 }
diff --git a/test/junit/org/luaj/vm2/ScriptDrivenTest.java b/test/junit/org/luaj/vm2/ScriptDrivenTest.java
index 20dc3a43..dd49ca35 100644
--- a/test/junit/org/luaj/vm2/ScriptDrivenTest.java
+++ b/test/junit/org/luaj/vm2/ScriptDrivenTest.java
@@ -24,6 +24,7 @@ package org.luaj.vm2;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -121,6 +122,8 @@ public class ScriptDrivenTest extends TestCase implements ResourceFinder {
 	    	}
 		} catch (MalformedURLException e) {
 			e.printStackTrace();
+		} catch (FileNotFoundException e) {
+			// Ignore and return null.
 		} catch (IOException ioe) {
 			ioe.printStackTrace();
 		}
diff --git a/test/lua/errors/debuglibargs.lua b/test/lua/errors/debuglibargs.lua
index 110a98bf..ad4a9300 100644
--- a/test/lua/errors/debuglibargs.lua
+++ b/test/lua/errors/debuglibargs.lua
@@ -111,7 +111,7 @@ checkallpass('debug.setupvalue',{{f},{2,'3'},{nil,aboolean,astring,n=3}})
 print('p,q', p, q)
 checkallerrors('debug.setupvalue',{},'value expected')
 checkallerrors('debug.setupvalue',{{f}},'value expected')
-checkallerrors('debug.setupvalue',{{f},{1}},'value expected')
+checkallerrors('debug.setupvalue',{{f},{2}},'value expected')
 checkallerrors('debug.setupvalue',{notafunction,{2}}, 'value expected')
 checkallerrors('debug.setupvalue',{{f},notanumber}, 'value expected')