From cd35ad7cbd6676139b8a0e6d95513496e9d8ba3c Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Thu, 29 Jul 2010 15:10:12 +0000
Subject: [PATCH] Improve lua2java code generation.

---
 src/core/org/luaj/vm2/TailcallVarargs.java    |  2 +-
 .../org/luaj/vm2/lua2java/JavaCodeGen.java    |  3 +-
 test/java/org/luaj/luajc/TestLuaJC.java       | 88 +++++++++++++------
 test/junit/org/luaj/vm2/FragmentsTest.java    | 28 +++++-
 4 files changed, 90 insertions(+), 31 deletions(-)

diff --git a/src/core/org/luaj/vm2/TailcallVarargs.java b/src/core/org/luaj/vm2/TailcallVarargs.java
index d55febd7..083de10d 100644
--- a/src/core/org/luaj/vm2/TailcallVarargs.java
+++ b/src/core/org/luaj/vm2/TailcallVarargs.java
@@ -34,7 +34,7 @@ public class TailcallVarargs extends Varargs {
 	
 	public TailcallVarargs(LuaValue object, LuaValue methodname, Varargs args) {
 		this.func = object.get(methodname);
-		this.args = args;
+		this.args = LuaValue.varargsOf(object, args);
 	}
 	
 	public boolean isTailcall() {
diff --git a/src/jse/org/luaj/vm2/lua2java/JavaCodeGen.java b/src/jse/org/luaj/vm2/lua2java/JavaCodeGen.java
index 5350d3bf..eda48ac0 100644
--- a/src/jse/org/luaj/vm2/lua2java/JavaCodeGen.java
+++ b/src/jse/org/luaj/vm2/lua2java/JavaCodeGen.java
@@ -243,7 +243,7 @@ public class JavaCodeGen {
 			}
 		}
 		
-		private void multiAssign(List varsOrNames, List<Exp> exps) {
+		private void multiAssign(final List varsOrNames, List<Exp> exps) {
 			final boolean[] needsTmpvarsMultiAssign = { false };
 			if ( exps.size() > 1 ) {
 				new Visitor() {
@@ -252,6 +252,7 @@ public class JavaCodeGen {
 					public void visit(FuncCall exp) { needsTmpvarsMultiAssign[0] = true; }
 					public void visit(IndexExp exp) { needsTmpvarsMultiAssign[0] = true; }
 					public void visit(MethodCall exp) { needsTmpvarsMultiAssign[0] = true; }
+					public void visit(NameExp exp) { needsTmpvarsMultiAssign[0] = true; }
 				}.visitExps(exps);
 			}
 			if ( needsTmpvarsMultiAssign[0] )
diff --git a/test/java/org/luaj/luajc/TestLuaJC.java b/test/java/org/luaj/luajc/TestLuaJC.java
index c18ca5d7..dbc8d81b 100644
--- a/test/java/org/luaj/luajc/TestLuaJC.java
+++ b/test/java/org/luaj/luajc/TestLuaJC.java
@@ -22,7 +22,10 @@
 package org.luaj.luajc;
 
 import java.io.ByteArrayInputStream;
+import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
 
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
@@ -34,36 +37,69 @@ public class TestLuaJC {
 	// create the script
 	public static String name = "script";
 	public static String script =
-		"local a='a\\ab\\bf\\fn\\nt\\tv\\vw\\133x\\222y'\n"+
-		"local t={string.byte(a,1,#a)}\n"+
-		"print( table.concat(t,',') )\n";
+		"for i = 1,2 do\n"+
+		"	t[i] = function()\n"+
+		"		return i\n"+
+		"	end\n"+
+		"end\n";
 		
 	public static void main(String[] args) throws Exception {
 		System.out.println(script);
-		
-		// create an environment to run in
-		LuaTable _G = JsePlatform.standardGlobals();
-		
-		// compile into a chunk, or load as a class
-		LuaValue chunk;
-		if ( ! (args.length>0 && args[0].equals("nocompile")) ) {
-			InputStream is =  new ByteArrayInputStream( script.getBytes() );
-			chunk = LuaJC.getInstance().load(is, "script", _G);
-		} else {
-			chunk = (LuaValue) Class.forName("script").newInstance();
+		try {
+			
+			// create an environment to run in
+			LuaTable _G = JsePlatform.standardGlobals();
+			
+			// compile into a chunk, or load as a class
+			LuaValue chunk;
+			if ( ! (args.length>0 && args[0].equals("nocompile")) ) {
+				InputStream is =  new ByteArrayInputStream( script.getBytes() );
+				chunk = LuaJC.getInstance().load(is, "script", _G);
+			} else {
+				chunk = (LuaValue) Class.forName("script").newInstance();
+			}
+			chunk.setfenv(_G);
+	
+			// call with arguments
+			LuaValue[] vargs = new LuaValue[args.length];
+			for ( int i=0; i<args.length; i++ )
+				vargs[i] = LuaValue.valueOf(args[i]);
+			Varargs cargs = LuaValue.varargsOf(vargs);
+			Varargs v = chunk.invoke(cargs);
+			
+			// print the result
+			for ( int i=1; i<=v.narg(); i++ )
+				System.out.println("result["+i+"]: "+v.arg(i));
+		} catch ( Throwable e ) {
+			e.printStackTrace();
+			saveClasses();
 		}
-		chunk.setfenv(_G);
-
-		// call with arguments
-		LuaValue[] vargs = new LuaValue[args.length];
-		for ( int i=0; i<args.length; i++ )
-			vargs[i] = LuaValue.valueOf(args[i]);
-		Varargs cargs = LuaValue.varargsOf(vargs);
-		Varargs v = chunk.invoke(cargs);
-		
-		// print the result
-		for ( int i=1; i<=v.narg(); i++ )
-			System.out.println("result["+i+"]: "+v.arg(i));
 	}
+
+	private static void saveClasses() throws Exception {
+        // create the chunk
+		String chunkname = "script";
+		String filename = "script";
+		String destdir = ".";
 		
+		InputStream is = new ByteArrayInputStream( script.getBytes() );
+		Hashtable t = LuaJC.getInstance().compileAll(is, chunkname, filename);
+
+        // write out the chunk
+    	for ( Enumeration e = t.keys(); e.hasMoreElements(); ) {
+    		String key = (String) e.nextElement();
+    		byte[] bytes = (byte[]) t.get(key);
+    		String destpath = (destdir!=null? destdir+"/": "") + key + ".class";
+    		System.out.println( 
+						"chunk "+chunkname+
+						" from "+filename+
+						" written to "+destpath
+						+" length="+bytes.length+" bytes");
+        	FileOutputStream fos = new FileOutputStream( destpath );
+        	fos.write( bytes );
+        	fos.close();
+        }
+		
+	}
+	
 }
diff --git a/test/junit/org/luaj/vm2/FragmentsTest.java b/test/junit/org/luaj/vm2/FragmentsTest.java
index 8cd2c758..dd4342ce 100644
--- a/test/junit/org/luaj/vm2/FragmentsTest.java
+++ b/test/junit/org/luaj/vm2/FragmentsTest.java
@@ -27,6 +27,7 @@ import java.io.InputStream;
 import junit.framework.TestCase;
 
 import org.luaj.vm2.compiler.LuaC;
+import org.luaj.vm2.lua2java.Lua2Java;
 import org.luaj.vm2.luajc.LuaJC;
 
 /** 
@@ -36,16 +37,27 @@ import org.luaj.vm2.luajc.LuaJC;
  */
 public class FragmentsTest extends TestCase {
 
+	static final int TEST_TYPE_LUAC     = 0;
+	static final int TEST_TYPE_LUAJC    = 1;
+	static final int TEST_TYPE_LUA2JAVA = 2;
+	static final int TEST_TYPE          = TEST_TYPE_LUA2JAVA;
+	
 	public void runFragment( Varargs expected, String script ) {
 		try {
 			String name = getName();
 			LuaTable _G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
 			InputStream is = new ByteArrayInputStream(script.getBytes("UTF-8"));
 			LuaValue chunk ;
-			if ( true ) {
+			switch ( TEST_TYPE ) {
+			case TEST_TYPE_LUA2JAVA: 
+				chunk = Lua2Java.instance.load(is,name,_G);
+				break;
+			case TEST_TYPE_LUAJC:
 				chunk = LuaJC.getInstance().load(is,name,_G);
-			} else {
+				break;
+			default:
 				chunk = LuaC.instance.load( is, name, _G );
+				break;
 			}
 			Varargs actual = chunk.invoke();
 			assertEquals( expected.narg(), actual.narg() );
@@ -135,7 +147,6 @@ public class FragmentsTest extends TestCase {
 			"local bar = {1000, math.sqrt(9)}\n"+
 			"return bar[1]+bar[2]\n" );
 	}
-
 	
 	public void testMultiAssign() {
 		// arargs evaluations are all done before assignments 
@@ -339,4 +350,15 @@ public class FragmentsTest extends TestCase {
 				"local a,b,c = 2,-2.5,0\n" +
 				"return (a==c), (b==c), (a==a), (a>c), (b>0)\n" );
 	}
+	
+	public void testNumericForUpvalues() {
+		runFragment( LuaValue.valueOf(8), 
+				"for i = 3,4 do\n"+
+				"	i = i + 5\n"+
+				"	local a = function()\n"+
+				"		return i\n"+
+				"	end\n" +
+				"	return a()\n"+
+				"end\n");
+	}
 }