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

Improve compatibility with luaj 1.0

Browse Source
This commit is contained in:
James Roseborough
2010-04-20 14:43:30 +00:00
parent 29f23222c2
commit 68b260efdd
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/org/luaj/vm2/lib/OsLib.java
View File

@@ -99,11 +99,11 @@ public class OsLib extends OneArgFunction {
return valueOf(clock()); return valueOf(clock());
case DATE: { case DATE: {
String s = args.optString(1, null); String s = args.optString(1, null);
long t = args.optlong(2,-1); double t = args.optdouble(2,-1);
return valueOf( date(s, t==-1? System.currentTimeMillis(): t) ); return valueOf( date(s, t==-1? System.currentTimeMillis()/1000.: t) );
} }
case DIFFTIME: case DIFFTIME:
return valueOf(difftime(args.checklong(1),args.checklong(2))); return valueOf(difftime(args.checkdouble(1),args.checkdouble(2)));
case EXECUTE: case EXECUTE:
return valueOf(execute(args.optString(1, null))); return valueOf(execute(args.optString(1, null)));
case EXIT: case EXIT:
@@ -149,8 +149,8 @@ public class OsLib extends OneArgFunction {
* @param t1 * @param t1
* @return diffeence in time values, in seconds * @return diffeence in time values, in seconds
*/ */
protected double difftime(long t2, long t1) { protected double difftime(double t2, double t1) {
return (t2 - t1) / 1000.; return t2 - t1;
} }
/** /**
@@ -177,8 +177,8 @@ public class OsLib extends OneArgFunction {
* @return a LString or a LTable containing date and time, * @return a LString or a LTable containing date and time,
* formatted according to the given string format. * formatted according to the given string format.
*/ */
protected String date(String format, long time) { protected String date(String format, double time) {
return new java.util.Date(time).toString(); return new java.util.Date((long)(time*1000)).toString();
} }
/** /**
@@ -254,7 +254,7 @@ public class OsLib extends OneArgFunction {
* cannot be honored. * cannot be honored.
*/ */
protected String setlocale(String locale, String category) { protected String setlocale(String locale, String category) {
return null; return "C";
} }
/** /**

4
src/core/org/luaj/vm2/lib/VarArgFunction.java
View File

@@ -33,11 +33,11 @@ abstract public class VarArgFunction extends LibFunction {
this.env = env; this.env = env;
} }
public final LuaValue call() { public LuaValue call() {
return invoke(NONE).arg1(); return invoke(NONE).arg1();
} }
public final LuaValue call(LuaValue arg) { public LuaValue call(LuaValue arg) {
return invoke(arg).arg1(); return invoke(arg).arg1();
} }

2
src/jse/org/luaj/vm2/lib/jse/JseOsLib.java
View File

@@ -39,7 +39,7 @@ import java.io.IOException;
public class JseOsLib extends org.luaj.vm2.lib.OsLib { public class JseOsLib extends org.luaj.vm2.lib.OsLib {
/** return code indicating the execute() threw an I/O exception */ /** return code indicating the execute() threw an I/O exception */
public static int EXEC_IOEXCEPTION = -1; public static int EXEC_IOEXCEPTION = 1;
/** return code indicating the execute() was interrupted */ /** return code indicating the execute() was interrupted */
public static int EXEC_INTERRUPTED = -2; public static int EXEC_INTERRUPTED = -2;