open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix global "arg" value for scripts run tom "lua" command.

Browse Source
This commit is contained in:
James Roseborough
2012-09-10 02:45:53 +00:00
parent f40a38ccae
commit 6ba1f86b7b
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/jse/lua.java
View File

@@ -45,7 +45,7 @@ import org.luaj.vm2.luajc.LuaJC;
* lua command for use in java se environments. * lua command for use in java se environments.
*/ */
public class lua { public class lua {
private static final String version = Lua._VERSION + "Copyright (c) 2009 Luaj.org.org"; private static final String version = Lua._VERSION + "Copyright (c) 2012 Luaj.org.org";
private static final String usage = private static final String usage =
"usage: java -cp luaj-jse.jar lua [options] [script [args]].\n" + "usage: java -cp luaj-jse.jar lua [options] [script [args]].\n" +
@@ -56,7 +56,6 @@ public class lua {
" -v show version information\n" + " -v show version information\n" +
" -b use luajc bytecode-to-bytecode compiler (requires bcel on class path)\n" + " -b use luajc bytecode-to-bytecode compiler (requires bcel on class path)\n" +
" -n nodebug - do not load debug library by default\n" + " -n nodebug - do not load debug library by default\n" +
" -p pretty-print the prototype\n" +
" -- stop handling options\n" + " -- stop handling options\n" +
" - execute stdin and stop handling options"; " - execute stdin and stop handling options";
@@ -111,9 +110,6 @@ public class lua {
case 'n': case 'n':
nodebug = true; nodebug = true;
break; break;
case 'p':
print = true;
break;
case '-': case '-':
if ( args[i].length() > 2 ) if ( args[i].length() > 2 )
usageExit(); usageExit();
@@ -191,28 +187,23 @@ public class lua {
LuaFunction c; LuaFunction c;
try { try {
c = LoadState.load(script, chunkname, "bt", _G); c = LoadState.load(script, chunkname, "bt", _G);
if (c instanceof LuaClosure) {
LuaClosure closure = (LuaClosure) c;
Print.print(closure.p);
// DebugLib.DEBUG_ENABLED = true;
} else {
System.out.println( "Not a LuaClosure: "+c);
}
Print.print(((LuaClosure)c).p);
} finally { } finally {
script.close(); script.close();
} }
Varargs scriptargs = (args!=null? setGlobalArg(args, firstarg): LuaValue.NONE); Varargs scriptargs = setGlobalArg(chunkname, args, firstarg, _G);
c.invoke( scriptargs ); c.invoke( scriptargs );
} catch ( Exception e ) { } catch ( Exception e ) {
e.printStackTrace( System.err ); e.printStackTrace( System.err );
} }
} }
private static Varargs setGlobalArg(String[] args, int i) { private static Varargs setGlobalArg(String chunkname, String[] args, int i, LuaValue _G) {
LuaTable arg = LuaValue.tableOf(); LuaTable arg = LuaValue.tableOf();
for ( int j=0; j<args.length; j++ ) for ( int j=0; j<args.length; j++ )
arg.set( j-i, LuaValue.valueOf(args[j]) ); arg.set( j-i, LuaValue.valueOf(args[j]) );
arg.set(0, LuaValue.valueOf(chunkname));
arg.set(-1, LuaValue.valueOf("luaj"));
_G.set("arg", arg);
return arg.unpack(); return arg.unpack();
} }