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

Improve jsr-223 bindings, allow ".lua" or "lua" as extensions, find classes when added as vm extension, enhance javadoc, add sources jar.

Browse Source
This commit is contained in:
James Roseborough
2011-02-11 17:40:37 +00:00
parent c49ede53e4
commit f335a25e6b
10 changed files with 106 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
README.html
View File

@@ -714,19 +714,23 @@ and LuaForge:
<h2>Main Changes by Version</h2>
<table cellspacing="10"><tr><td><table cellspacing="4">
<tr valign="top"><td>&nbsp;&nbsp;<b>2.0</b></td><td><ul>
<li>Initial release of 2.0 version
<li>Initial release of 2.0 version </li>
</ul></td></tr>
<tr valign="top"><td>&nbsp;&nbsp;<b>2.0.1</b></td><td><ul>
<li>Improve correctness of singleton construction related to static initialization
<li>Fix nan-related error in constant folding logic that was failing on some JVMs
<li>JSR-223 fixes: add META-INF/services entry in jse jar, improve bindings implementation
<li>Improve correctness of singleton construction related to static initialization </li>
<li>Fix nan-related error in constant folding logic that was failing on some JVMs </li>
<li>JSR-223 fixes: add META-INF/services entry in jse jar, improve bindings implementation </li>
</ul></td></tr>
<tr valign="top"><td>&nbsp;&nbsp;<b>2.0.2</b></td><td><ul>
<li>JSR-223 bindings change: non Java-primitives will now be passed as LuaValue
<li>Fix selection logic when picking from functions with same name
<li>JSR-223 bindings change: non Java-primitives will now be passed as LuaValue </li>
<li>JSR-223 enhancement: allow both ".lua" and "lua" as extensions in getScriptEngine() </li>
<li>Improve selection logic when binding to overloaded functions using luajava</li>
<li>Enhance javadoc, put it <a href="http://luaj.sourceforge.net/api/2.0/index.html">online</a>
and <a href="docs/api/index.html">in distribution</a>
</li>
<li>Add lib/luaj-sources-2.0.2.jar for easier integration into an IDE such as Netbeans </li>
</ul></td></tr>
</table>
<h2>Known Issues</h2>
<ul>
<li>debug code may not be completely removed by some obfuscators

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

@@ -155,7 +155,7 @@ public class BaseLib extends OneArgFunction implements ResourceFinder {
return c.getResourceAsStream(filename.startsWith("/")? filename: "/"+filename);
}
public static final class BaseLib2 extends TwoArgFunction {
static final class BaseLib2 extends TwoArgFunction {
public LuaValue call(LuaValue arg1, LuaValue arg2) {
switch ( opcode ) {
case 0: // "collectgarbage", // ( opt [,arg] ) -> value
@@ -202,7 +202,7 @@ public class BaseLib extends OneArgFunction implements ResourceFinder {
return f;
}
public static final class BaseLibV extends VarArgFunction {
static final class BaseLibV extends VarArgFunction {
public BaseLib baselib;
public Varargs invoke(Varargs args) {
switch ( opcode ) {

2
src/core/org/luaj/vm2/lib/IoLib.java
View File

@@ -247,7 +247,7 @@ public class IoLib extends OneArgFunction {
((IoLibV) t.get(k[i])).iolib = this;
}
public static final class IoLibV extends VarArgFunction {
static final class IoLibV extends VarArgFunction {
public IoLib iolib;
public IoLibV() {
}

6
src/core/org/luaj/vm2/lib/MathLib.java
View File

@@ -104,7 +104,7 @@ public class MathLib extends OneArgFunction {
return t;
}
public static final class MathLib1 extends OneArgFunction {
static final class MathLib1 extends OneArgFunction {
public LuaValue call(LuaValue arg) {
switch ( opcode ) {
case 0: return valueOf(Math.abs(arg.checkdouble()));
@@ -122,7 +122,7 @@ public class MathLib extends OneArgFunction {
}
}
public static final class MathLib2 extends TwoArgFunction {
static final class MathLib2 extends TwoArgFunction {
protected MathLib mathlib;
public LuaValue call(LuaValue arg1, LuaValue arg2) {
switch ( opcode ) {
@@ -189,7 +189,7 @@ public class MathLib extends OneArgFunction {
return p;
}
public static final class MathLibV extends VarArgFunction {
static final class MathLibV extends VarArgFunction {
protected MathLib mathlib;
public Varargs invoke(Varargs args) {
switch ( opcode ) {

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

@@ -126,7 +126,7 @@ public class PackageLib extends OneArgFunction {
return env;
}
public static final class PkgLib1 extends OneArgFunction {
static final class PkgLib1 extends OneArgFunction {
PackageLib lib;
public PkgLib1(LuaValue env,String name, int opcode, PackageLib lib) {
this.env = env;
@@ -151,7 +151,7 @@ public class PackageLib extends OneArgFunction {
}
}
public static final class PkgLibV extends VarArgFunction {
static final class PkgLibV extends VarArgFunction {
PackageLib lib;
public PkgLibV(LuaValue env,String name, int opcode, PackageLib lib) {
this.env = env;

8
src/core/org/luaj/vm2/lib/StringLib.java
View File

@@ -82,7 +82,7 @@ public class StringLib extends OneArgFunction {
return t;
}
public static final class StringLib1 extends OneArgFunction {
static final class StringLib1 extends OneArgFunction {
public LuaValue call(LuaValue arg) {
switch ( opcode ) {
case 0: return dump(arg); // dump (function)
@@ -95,7 +95,7 @@ public class StringLib extends OneArgFunction {
}
}
public static final class StringLibV extends VarArgFunction {
static final class StringLibV extends VarArgFunction {
public Varargs invoke(Varargs args) {
switch ( opcode ) {
case 0: return StringLib.byte_( args );
@@ -319,7 +319,7 @@ public class StringLib extends OneArgFunction {
private static final String FLAGS = "-+ #0";
private static class FormatDesc {
static class FormatDesc {
private boolean leftAdjust;
private boolean zeroPad;
@@ -810,7 +810,7 @@ public class StringLib extends OneArgFunction {
CHAR_TABLE['\f'] |= MASK_SPACE;
};
private static class MatchState {
static class MatchState {
final LuaString s;
final LuaString p;
final Varargs args;

2
src/core/org/luaj/vm2/lib/TableLib.java
View File

@@ -83,7 +83,7 @@ public class TableLib extends OneArgFunction {
return NIL;
}
public static final class TableLibV extends VarArgFunction {
static final class TableLibV extends VarArgFunction {
public Varargs invoke(Varargs args) {
switch ( opcode ) {
case 0: { // "remove" (table [, pos]) -> removed-ele

13
src/jse/org/luaj/vm2/lib/jse/LuajavaLib.java
View File

@@ -123,14 +123,14 @@ public class LuajavaLib extends VarArgFunction {
return t;
}
case BINDCLASS: {
final Class clazz = Class.forName(args.checkjstring(1));
final Class clazz = classForName(args.checkjstring(1));
return toUserdata( clazz, clazz );
}
case NEWINSTANCE:
case NEW: {
// get constructor
final LuaValue c = args.checkvalue(1);
final Class clazz = (opcode==NEWINSTANCE? Class.forName(c.tojstring()): (Class) c.checkuserdata(Class.class));
final Class clazz = (opcode==NEWINSTANCE? classForName(c.tojstring()): (Class) c.checkuserdata(Class.class));
final Varargs consargs = args.subargs(2);
final long paramssig = LuajavaLib.paramsSignatureOf( consargs );
final Constructor con = resolveConstructor( clazz, paramssig );
@@ -153,7 +153,7 @@ public class LuajavaLib extends VarArgFunction {
// get the interfaces
final Class[] ifaces = new Class[niface];
for ( int i=0; i<niface; i++ )
ifaces[i] = Class.forName(args.checkjstring(i+1));
ifaces[i] = classForName(args.checkjstring(i+1));
// create the invocation handler
InvocationHandler handler = new InvocationHandler() {
@@ -193,7 +193,7 @@ public class LuajavaLib extends VarArgFunction {
// get constructor
String classname = args.checkjstring(1);
String methodname = args.checkjstring(2);
Class clazz = Class.forName(classname);
Class clazz = classForName(classname);
Method method = clazz.getMethod(methodname, new Class[] {});
Object result = method.invoke(clazz, new Object[] {});
if ( result instanceof LuaValue ) {
@@ -214,6 +214,11 @@ public class LuajavaLib extends VarArgFunction {
}
}
// load classes using app loader to allow luaj to be used as an extension
protected Class classForName(String name) throws ClassNotFoundException {
return Class.forName(name, true, ClassLoader.getSystemClassLoader());
}
// params signature is
// - low 6-bits are number of parameters
// - each of next 9 6-bit fields encode a parameter type:

8
src/jse/org/luaj/vm2/script/LuaScriptEngineFactory.java
View File

@@ -22,7 +22,6 @@
package org.luaj.vm2.script;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.script.ScriptEngine;
@@ -33,7 +32,10 @@ import javax.script.ScriptEngineFactory;
*/
public class LuaScriptEngineFactory implements ScriptEngineFactory {
private static final String FILEEXT = ".lua";
private static final String [] EXTENSIONS = {
"lua",
".lua",
};
private static final String [] MIMETYPES = {
"text/plain",
@@ -54,7 +56,7 @@ public class LuaScriptEngineFactory implements ScriptEngineFactory {
public LuaScriptEngineFactory() {
extensions = Collections.nCopies(1, FILEEXT);
extensions = Arrays.asList(EXTENSIONS);
mimeTypes = Arrays.asList(MIMETYPES);
names = Arrays.asList(NAMES);
}

82
test/junit/org/luaj/vm2/lib/jse/LuaJavaCoercionTest.java
View File

@@ -268,29 +268,81 @@ public class LuaJavaCoercionTest extends TestCase {
}
public static class A {
public String set( int foo ) {
return "from set(int) "+foo;
}
public String set( String foo ) {
return "from set(String) "+foo;
}
public String get() {
return "bar";
}
}
public static class B extends A{
public String set( Object x ) { return "set(Object) "; }
public String set( String x ) { return "set(String) "+x; }
public String set( A x ) { return "set(A) "; }
public String set( B x ) { return "set(B) "; }
public String set( C x ) { return "set(C) "; }
public String set( byte x ) { return "set(byte) "+x; }
public String set( char x ) { return "set(char) "+x; }
public String set( short x ) { return "set(short) "+x; }
public String set( int x ) { return "set(int) "+x; }
public String set( long x ) { return "set(long) "+x; }
public String set( float x ) { return "set(float) "+x; }
public String set( double x ) { return "set(double) "+x; }
public String setr( double x ) { return "setr(double) "+x; }
public String setr( float x ) { return "setr(float) "+x; }
public String setr( long x ) { return "setr(long) "+x; }
public String setr( int x ) { return "setr(int) "+x; }
public String setr( short x ) { return "setr(short) "+x; }
public String setr( char x ) { return "setr(char) "+x; }
public String setr( byte x ) { return "setr(byte) "+x; }
public String setr( C x ) { return "setr(C) "; }
public String setr( B x ) { return "setr(B) "; }
public String setr( A x ) { return "setr(A) "; }
public String setr( String x ) { return "setr(String) "+x; }
public String setr( Object x ) { return "setr(Object) "; }
public Object getObject() { return new Object(); }
public String getString() { return "abc"; }
public A getA() { return new A(); }
public B getB() { return new B(); }
public C getC() { return new C(); }
public byte getbyte() { return 1; }
public char getchar() { return 2; }
public short getshort() { return 3; }
public int getint() { return 4; }
public long getlong() { return 5; }
public float getfloat() { return 6.5f; }
public double getdouble() { return 7.5; }
}
public static class C extends B {
}
public void testOverloadedJavaMethods() {
public void testOverloadedJavaMethodObject() { doOverloadedMethodTest( "Object", "" ); }
public void testOverloadedJavaMethodString() { doOverloadedMethodTest( "String", "abc" ); }
public void testOverloadedJavaMethodA() { doOverloadedMethodTest( "A", "" ); }
public void testOverloadedJavaMethodB() { doOverloadedMethodTest( "B", "" ); }
public void testOverloadedJavaMethodC() { doOverloadedMethodTest( "C", "" ); }
public void testOverloadedJavaMethodByte() { doOverloadedMethodTest( "byte", "1" ); }
public void testOverloadedJavaMethodChar() { doOverloadedMethodTest( "char", "2" ); }
public void testOverloadedJavaMethodShort() { doOverloadedMethodTest( "short", "3" ); }
public void testOverloadedJavaMethodInt() { doOverloadedMethodTest( "int", "4" ); }
public void testOverloadedJavaMethodLong() { doOverloadedMethodTest( "long", "5" ); }
public void testOverloadedJavaMethodFloat() { doOverloadedMethodTest( "float", "6.5" ); }
public void testOverloadedJavaMethodDouble() { doOverloadedMethodTest( "double", "7.5" ); }
private void doOverloadedMethodTest( String typename, String value ) {
String script =
"a = luajava.newInstance('"+A.class.getName()+"');\n" +
"return a:set(a:get())";
"local a = luajava.newInstance('"+B.class.getName()+"');\n" +
"local b = a:set(a:get"+typename+"())\n" +
"local c = a:setr(a:get"+typename+"())\n" +
"return b,c";
Varargs chunk = _G.get("loadstring").call(LuaValue.valueOf(script));
if ( ! chunk.arg1().toboolean() )
fail( chunk.arg(2).toString() );
Varargs results = chunk.arg1().invoke();
int nresults = results.narg();
String sa = results.tojstring(1);
assertEquals( 1, nresults );
assertEquals( "from set(String) bar", sa );
assertEquals( 2, nresults );
LuaValue b = results.arg(1);
LuaValue c = results.arg(2);
String sb = b.tojstring();
String sc = c.tojstring();
assertEquals( "set("+typename+") "+value, sb );
assertEquals( "setr("+typename+") "+value, sc );
}
}