Fixes to luajc bytecode generation.

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 {

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 {

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");
+		}
 	}
 }

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();
 		}

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')