From 4950d3c612dbd8356cf73d5ca60059ce067ac714 Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Sat, 12 Nov 2011 23:59:37 +0000
Subject: [PATCH] Fix lua command vararg values passed into main script to
 match what is in global arg table

---
 README.html      |  1 +
 src/jse/lua.java | 34 ++++++++++++++++------------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/README.html b/README.html
index a561f478..f10d3c2b 100644
--- a/README.html
+++ b/README.html
@@ -731,6 +731,7 @@ and LuaForge:
 <li>Add lib/luaj-sources-2.0.2.jar for easier integration into an IDE such as Netbeans </li>
 <tr valign="top"><td>&nbsp;&nbsp;<b>2.0.3</b></td><td><ul>
 <li>Improve coroutine state logic including let unreferenced coroutines be garbage collected </li>
+<li>Fix lua command vararg values passed into main script to match what is in global arg table </li>
 </ul></td></tr>
 </table></td></tr></table>
 
diff --git a/src/jse/lua.java b/src/jse/lua.java
index cbee49b2..c3f76da1 100644
--- a/src/jse/lua.java
+++ b/src/jse/lua.java
@@ -33,6 +33,7 @@ import org.luaj.vm2.Lua;
 import org.luaj.vm2.LuaFunction;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.Varargs;
 import org.luaj.vm2.lib.jse.JsePlatform;
 import org.luaj.vm2.lua2java.Lua2Java;
 import org.luaj.vm2.luajc.LuaJC;
@@ -138,12 +139,10 @@ public class lua {
 			processing = true;
 			for ( int i=0; i<args.length; i++ ) {
 				if ( ! processing || ! args[i].startsWith("-") ) {
-					setGlobalArg( _G, args, i );
-					processScript( new FileInputStream(args[i]), args[i] );
+					processScript( new FileInputStream(args[i]), args[i], args, i );
 					break;
 				} else if ( "-".equals( args[i] ) ) {
-					setGlobalArg( _G, args, i );
-					processScript( System.in, "=stdin" );
+					processScript( System.in, "=stdin", args, i );
 					break;
 				} else {
 					switch ( args[i].charAt(1) ) {
@@ -152,8 +151,7 @@ public class lua {
 						break;
 					case 'e':
 						++i;
-						setGlobalArg( _G, args, i );
-						processScript( new ByteArrayInputStream(args[i].getBytes()), "string" );
+						processScript( new ByteArrayInputStream(args[i].getBytes()), "string", args, i );
 						break;
 					case '-':
 						processing = false;
@@ -171,13 +169,6 @@ public class lua {
 		}
 	}
 
-	private static void setGlobalArg(LuaValue _g2, String[] args, int i) {
-		LuaTable arg = LuaValue.tableOf();
-		for ( int j=0; j<args.length; j++ )
-			arg.set( j-i, LuaValue.valueOf(args[j]) );
-		_G.set( "arg", arg );
-	}
-
 	private static void loadLibrary( String libname ) throws IOException {
 		LuaValue slibname =LuaValue.valueOf(libname); 
 		try {
@@ -195,7 +186,7 @@ public class lua {
 		}
 	}
 	
-	private static void processScript( InputStream script, String chunkname ) throws IOException {
+	private static void processScript( InputStream script, String chunkname, String[] args, int firstarg ) throws IOException {
 		try {
 			LuaFunction c;
 			try {
@@ -203,14 +194,21 @@ public class lua {
 			} finally {
 				script.close();
 			}
-			c.invoke( LuaValue.valueOf(chunkname) );
+			Varargs scriptargs = (args!=null? setGlobalArg(args, firstarg): LuaValue.NONE);
+			c.invoke( scriptargs );
 		} catch ( Throwable t ) {
 			t.printStackTrace( System.err );
 		}
 	}
 
-	private static final String[] NOARGS = {};
-	
+	private static Varargs setGlobalArg(String[] args, int i) {
+		LuaTable arg = LuaValue.tableOf();
+		for ( int j=0; j<args.length; j++ )
+			arg.set( j-i, LuaValue.valueOf(args[j]) );
+		_G.set( "arg", arg );
+		return _G.get("unpack").invoke(arg);
+	}
+
 	private static void interactiveMode( ) throws IOException {
 		BufferedReader reader = new BufferedReader( new InputStreamReader( System.in ) );
 		while ( true ) {
@@ -219,7 +217,7 @@ public class lua {
 			String line = reader.readLine();
 			if ( line == null )
 				return;
-			processScript( new ByteArrayInputStream(line.getBytes()), "=stdin" );
+			processScript( new ByteArrayInputStream(line.getBytes()), "=stdin", null, 0 );
 		}
 	}
 }