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

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