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

Fixed LuaJC not writing java package to bytecode correctly

Browse Source
This commit is contained in:
UnlegitDqrk
2026-03-01 13:11:33 +01:00
parent 01739d4e77
commit 7338475ae4
4 changed files with 185 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
jse/src/main/java/luajc.java
View File

@@ -1,24 +1,24 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2009-2012 Luaj.org. All rights reserved. * Copyright (c) 2009-2012 Luaj.org. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is * copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
******************************************************************************/ ******************************************************************************/
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@@ -36,27 +36,27 @@ import org.luaj.vm2.libs.jse.JsePlatform;
import org.luaj.vm2.luajc.LuaJC; import org.luaj.vm2.luajc.LuaJC;
/** /**
* Compiler for lua files to compile lua sources or lua binaries into java classes. * Compiler for lua files to compile lua sources or lua binaries into java classes.
*/ */
public class luajc { public class luajc {
private static final String version = Lua._VERSION + " Copyright (C) 2012 luaj.org"; private static final String version = Lua._VERSION + " Copyright (C) 2012 luaj.org";
private static final String usage = private static final String usage =
"usage: java -cp luaj-jse.jar,bcel-5.2.jar luajc [options] fileordir [, fileordir ...]\n" + "usage: java -cp luaj-jse.jar,bcel-5.2.jar luajc [options] fileordir [, fileordir ...]\n" +
"Available options are:\n" + "Available options are:\n" +
" - process stdin\n" + " - process stdin\n" +
" -s src source directory\n" + " -s src source directory\n" +
" -d dir destination directory\n" + " -d dir destination directory\n" +
" -p pkg package prefix to apply to all classes\n" + " -p pkg package prefix to apply to all classes\n" +
" -m generate main(String[]) function for JSE\n" + " -m generate main(String[]) function for JSE\n" +
" -r recursively compile all\n" + " -r recursively compile all\n" +
" -l load classes to verify generated bytecode\n" + " -l load classes to verify generated bytecode\n" +
" -c enc use the supplied encoding 'enc' for input files\n" + " -c enc use the supplied encoding 'enc' for input files\n" +
" -v verbose\n"; " -v verbose\n";
private static void usageExit() { private static void usageExit() {
System.out.println(usage); System.out.println(usage);
System.exit(-1); System.exit(-1);
} }
private String srcdir = "."; private String srcdir = ".";
@@ -75,55 +75,55 @@ public class luajc {
} }
private luajc( String[] args ) throws IOException { private luajc( String[] args ) throws IOException {
// process args // process args
List seeds = new ArrayList (); List seeds = new ArrayList ();
// get stateful args // get stateful args
for ( int i=0; i<args.length; i++ ) { for ( int i=0; i<args.length; i++ ) {
if ( ! args[i].startsWith("-") ) { if ( ! args[i].startsWith("-") ) {
seeds.add(args[i]); seeds.add(args[i]);
} else { } else {
switch ( args[i].charAt(1) ) { switch ( args[i].charAt(1) ) {
case 's': case 's':
if ( ++i >= args.length ) if ( ++i >= args.length )
usageExit();
srcdir = args[i];
break;
case 'd':
if ( ++i >= args.length )
usageExit();
destdir = args[i];
break;
case 'l':
loadclasses = true;
break;
case 'p':
if ( ++i >= args.length )
usageExit();
pkgprefix = args[i];
break;
case 'm':
genmain = true;
break;
case 'r':
recurse = true;
break;
case 'c':
if ( ++i >= args.length )
usageExit();
encoding = args[i];
break;
case 'v':
verbose = true;
break;
default:
usageExit(); usageExit();
srcdir = args[i]; break;
break;
case 'd':
if ( ++i >= args.length )
usageExit();
destdir = args[i];
break;
case 'l':
loadclasses = true;
break;
case 'p':
if ( ++i >= args.length )
usageExit();
pkgprefix = args[i];
break;
case 'm':
genmain = true;
break;
case 'r':
recurse = true;
break;
case 'c':
if ( ++i >= args.length )
usageExit();
encoding = args[i];
break;
case 'v':
verbose = true;
break;
default:
usageExit();
break;
} }
} }
} }
// echo version // echo version
if ( verbose ) { if ( verbose ) {
System.out.println(version); System.out.println(version);
@@ -142,19 +142,19 @@ public class luajc {
// collect up files to process // collect up files to process
for ( int i=0; i<seeds.size(); i++ ) for ( int i=0; i<seeds.size(); i++ )
collectFiles( srcdir+"/"+seeds.get(i) ); collectFiles( srcdir+"/"+seeds.get(i) );
// check for at least one file // check for at least one file
if ( files.size() <= 0 ) { if ( files.size() <= 0 ) {
System.err.println("no files found in "+seeds); System.err.println("no files found in "+seeds);
System.exit(-1); System.exit(-1);
} }
// process input files // process input files
globals = JsePlatform.standardGlobals(); globals = JsePlatform.standardGlobals();
for ( int i=0,n=files.size(); i<n; i++ ) for ( int i=0,n=files.size(); i<n; i++ )
processFile( (InputFile) files.get(i) ); processFile( (InputFile) files.get(i) );
} }
private void collectFiles(String path) { private void collectFiles(String path) {
File f = new File(path); File f = new File(path);
if ( f.isDirectory() && recurse ) if ( f.isDirectory() && recurse )
@@ -167,7 +167,7 @@ public class luajc {
} }
private void scandir(File dir, String javapackage) { private void scandir(File dir, String javapackage) {
File[] f = dir.listFiles(); File[] f = dir.listFiles();
for ( int i=0; i<f.length; i++ ) for ( int i=0; i<f.length; i++ )
scanfile( dir, f[i], javapackage ); scanfile( dir, f[i], javapackage );
} }
@@ -188,11 +188,13 @@ public class luajc {
} }
public Class findClass(String classname) throws ClassNotFoundException { public Class findClass(String classname) throws ClassNotFoundException {
byte[] bytes = (byte[]) t.get(classname); byte[] bytes = (byte[]) t.get(classname);
if ( bytes != null ) if ( bytes != null ) {
return defineClass(classname, bytes, 0, bytes.length); classname = classname.replace('/', '.');
return super.findClass(classname); return defineClass(classname, bytes, 0, bytes.length);
} }
return super.findClass(classname);
}
} }
class InputFile { class InputFile {
@@ -201,7 +203,7 @@ public class luajc {
public File infile; public File infile;
public File outdir; public File outdir;
public String javapackage; public String javapackage;
public InputFile(File dir, File f, String javapackage) { public InputFile(File dir, File f, String javapackage) {
this.infile = f; this.infile = f;
String subdir = javapackage!=null? javapackage.replace('.', '/'): null; String subdir = javapackage!=null? javapackage.replace('.', '/'): null;
@@ -213,58 +215,58 @@ public class luajc {
this.outdir = new File(outdirpath); this.outdir = new File(outdirpath);
} }
} }
private void processFile( InputFile inf ) { private void processFile( InputFile inf ) {
inf.outdir.mkdirs(); inf.outdir.mkdirs();
try { try {
if ( verbose ) if ( verbose )
System.out.println("chunk="+inf.luachunkname+" srcfile="+inf.srcfilename); System.out.println("chunk="+inf.luachunkname+" srcfile="+inf.srcfilename);
// create the chunk // create the chunk
FileInputStream fis = new FileInputStream( inf.infile ); FileInputStream fis = new FileInputStream( inf.infile );
final Hashtable t = encoding != null? final Hashtable t = encoding != null?
LuaJC.instance.compileAll( new InputStreamReader(fis, encoding), inf.luachunkname, inf.srcfilename, globals, genmain): LuaJC.instance.compileAll( new InputStreamReader(fis, encoding), inf.luachunkname, inf.srcfilename, globals, genmain):
LuaJC.instance.compileAll( fis, inf.luachunkname, inf.srcfilename, globals, genmain); LuaJC.instance.compileAll( fis, inf.luachunkname, inf.srcfilename, globals, genmain);
fis.close(); fis.close();
// write out the chunk
for ( Enumeration e = t.keys(); e.hasMoreElements(); ) {
String key = (String) e.nextElement();
byte[] bytes = (byte[]) t.get(key);
if ( key.indexOf('/')>=0 ) {
String d = (destdir!=null? destdir+"/": "")+key.substring(0,key.lastIndexOf('/'));
new File(d).mkdirs();
}
String destpath = (destdir!=null? destdir+"/": "") + key + ".class";
if ( verbose )
System.out.println( " "+destpath +" ("+bytes.length+" bytes)");
FileOutputStream fos = new FileOutputStream( destpath );
fos.write( bytes );
fos.close();
}
// try to load the files // write out the chunk
if ( loadclasses ) { for ( Enumeration e = t.keys(); e.hasMoreElements(); ) {
String key = (String) e.nextElement();
byte[] bytes = (byte[]) t.get(key);
if ( key.indexOf('/')>=0 ) {
String d = (destdir!=null? destdir+"/": "")+key.substring(0,key.lastIndexOf('/'));
new File(d).mkdirs();
}
String destpath = (destdir!=null? destdir+"/": "") + key + ".class";
if ( verbose )
System.out.println( " "+destpath +" ("+bytes.length+" bytes)");
FileOutputStream fos = new FileOutputStream( destpath );
fos.write( bytes );
fos.close();
}
// try to load the files
if ( loadclasses ) {
ClassLoader loader = new LocalClassLoader(t); ClassLoader loader = new LocalClassLoader(t);
for ( Enumeration e = t.keys(); e.hasMoreElements(); ) { for ( Enumeration e = t.keys(); e.hasMoreElements(); ) {
String classname = (String) e.nextElement(); String classname = (String) e.nextElement();
try { try {
Class c = loader.loadClass(classname); Class c = loader.loadClass(classname);
Object o = c.newInstance(); Object o = c.newInstance();
if ( verbose ) if ( verbose )
System.out.println(" loaded "+classname+" as "+o ); System.out.println(" loaded "+classname+" as "+o );
} catch ( Exception ex ) { } catch ( Exception ex ) {
System.out.flush(); System.out.flush();
System.err.println(" failed to load "+classname+": "+ex ); System.err.println(" failed to load "+classname+": "+ex );
System.err.flush(); System.err.flush();
} }
} }
} }
} catch ( Exception e ) { } catch ( Exception e ) {
System.err.println(" failed to load "+inf.srcfilename+": "+e ); System.err.println(" failed to load "+inf.srcfilename+": "+e );
e.printStackTrace( System.err ); e.printStackTrace( System.err );
System.err.flush(); System.err.flush();
} }
} }
} }

2
jse/src/main/java/org/luaj/vm2/luajc/JavaBuilder.java
View File

@@ -77,7 +77,7 @@ public class JavaBuilder {
private static final String STR_LUATABLE = LuaTable.class.getName(); private static final String STR_LUATABLE = LuaTable.class.getName();
private static final String STR_BUFFER = Buffer.class.getName(); private static final String STR_BUFFER = Buffer.class.getName();
private static final String STR_STRING = String.class.getName(); private static final String STR_STRING = String.class.getName();
private static final String STR_JSEPLATFORM = "org.luaj.vm2.lib.jse.JsePlatform"; private static final String STR_JSEPLATFORM = "org.luaj.vm2.libs.jse.JsePlatform";
private static final ObjectType TYPE_VARARGS = new ObjectType(STR_VARARGS); private static final ObjectType TYPE_VARARGS = new ObjectType(STR_VARARGS);
private static final ObjectType TYPE_LUAVALUE = new ObjectType(STR_LUAVALUE); private static final ObjectType TYPE_LUAVALUE = new ObjectType(STR_LUAVALUE);

108
jse/src/main/java/org/luaj/vm2/luajc/LuaJC.java
View File

@@ -1,24 +1,24 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2010 Luaj.org. All rights reserved. * Copyright (c) 2010 Luaj.org. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is * copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
******************************************************************************/ ******************************************************************************/
package org.luaj.vm2.luajc; package org.luaj.vm2.luajc;
import java.io.IOException; import java.io.IOException;
@@ -32,19 +32,18 @@ import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaValue; import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Prototype; import org.luaj.vm2.Prototype;
import org.luaj.vm2.compiler.LuaC; import org.luaj.vm2.compiler.LuaC;
import org.luaj.vm2.libs.jse.JsePlatform;
/** /**
* Implementation of {@link Globals.Compiler} which does direct * Implementation of {@link org.luaj.vm2.Globals.Compiler} which does direct
* lua-to-java-bytecode compiling. * lua-to-java-bytecode compiling.
* <p> * <p>
* By default, when using {@link JsePlatform} or * By default, when using {@link org.luaj.vm2.libs.jse.JsePlatform} or
* {@link org.luaj.vm2.libs.jme.JmePlatform} * {@link org.luaj.vm2.libs.jme.JmePlatform}
* to construct globals, the plain compiler {@link LuaC} is installed and lua code * to construct globals, the plain compiler {@link LuaC} is installed and lua code
* will only be compiled into lua bytecode and execute as {@link LuaClosure}. * will only be compiled into lua bytecode and execute as {@link LuaClosure}.
* <p> * <p>
* To override the default compiling behavior with {@link LuaJC} * To override the default compiling behavior with {@link LuaJC}
* lua-to-java bytecode compiler, install it before undumping code, * lua-to-java bytecode compiler, install it before undumping code,
* for example: * for example:
* <pre> {@code * <pre> {@code
* LuaValue globals = JsePlatform.standardGlobals(); * LuaValue globals = JsePlatform.standardGlobals();
@@ -54,27 +53,27 @@ import org.luaj.vm2.libs.jse.JsePlatform;
* chunk.call(); * chunk.call();
* } </pre> * } </pre>
* <p> * <p>
* This requires the bcel library to be on the class path to work as expected. * This requires the bcel library to be on the class path to work as expected.
* If the library is not found, the default {@link LuaC} lua-to-lua-bytecode * If the library is not found, the default {@link LuaC} lua-to-lua-bytecode
* compiler will be used. * compiler will be used.
* *
* @see Globals#compiler * @see Globals#compiler
* @see #install(Globals) * @see #install(Globals)
* @see LuaC * @see org.luaj.vm2.compiler.LuaC
* @see LuaValue * @see LuaValue
*/ */
public class LuaJC implements Globals.Loader { public class LuaJC implements Globals.Loader {
public static final LuaJC instance = new LuaJC(); public static final LuaJC instance = new LuaJC();
/** /**
* Install the compiler as the main Globals.Loader to use in a set of globals. * Install the compiler as the main Globals.Loader to use in a set of globals.
* Will fall back to the LuaC prototype compiler. * Will fall back to the LuaC prototype compiler.
*/ */
public static final void install(Globals G) { public static final void install(Globals G) {
G.loader = instance; G.loader = instance;
} }
protected LuaJC() {} protected LuaJC() {}
public Hashtable compileAll(InputStream script, String chunkname, String filename, Globals globals, boolean genmain) throws IOException { public Hashtable compileAll(InputStream script, String chunkname, String filename, Globals globals, boolean genmain) throws IOException {
@@ -82,13 +81,13 @@ public class LuaJC implements Globals.Loader {
final Prototype p = globals.loadPrototype(script, classname, "bt"); final Prototype p = globals.loadPrototype(script, classname, "bt");
return compileProtoAndSubProtos(p, classname, filename, genmain); return compileProtoAndSubProtos(p, classname, filename, genmain);
} }
public Hashtable compileAll(Reader script, String chunkname, String filename, Globals globals, boolean genmain) throws IOException { public Hashtable compileAll(Reader script, String chunkname, String filename, Globals globals, boolean genmain) throws IOException {
final String classname = toStandardJavaClassName( chunkname ); final String classname = toStandardJavaClassName( chunkname );
final Prototype p = globals.compilePrototype(script, classname); final Prototype p = globals.compilePrototype(script, classname);
return compileProtoAndSubProtos(p, classname, filename, genmain); return compileProtoAndSubProtos(p, classname, filename, genmain);
} }
private Hashtable compileProtoAndSubProtos(Prototype p, String classname, String filename, boolean genmain) throws IOException { private Hashtable compileProtoAndSubProtos(Prototype p, String classname, String filename, boolean genmain) throws IOException {
final String luaname = toStandardLuaFileName( filename ); final String luaname = toStandardLuaFileName( filename );
final Hashtable h = new Hashtable(); final Hashtable h = new Hashtable();
@@ -96,7 +95,7 @@ public class LuaJC implements Globals.Loader {
insert( h, gen ); insert( h, gen );
return h; return h;
} }
private void insert(Hashtable h, JavaGen gen) { private void insert(Hashtable h, JavaGen gen) {
h.put(gen.classname, gen.bytecode); h.put(gen.classname, gen.bytecode);
for ( int i=0, n=gen.inners!=null? gen.inners.length: 0; i<n; i++ ) for ( int i=0, n=gen.inners!=null? gen.inners.length: 0; i<n; i++ )
@@ -109,25 +108,42 @@ public class LuaJC implements Globals.Loader {
JavaLoader loader = new JavaLoader(); JavaLoader loader = new JavaLoader();
return loader.load(p, classname, luaname, globals); return loader.load(p, classname, luaname, globals);
} }
private static String toStandardJavaClassName( String luachunkname ) { private static String toStandardJavaClassName( String luachunkname ) {
String stub = toStub( luachunkname ); String stub = toStub( luachunkname );
StringBuffer classname = new StringBuffer(); StringBuffer classname = new StringBuffer();
for (int i = 0, n = stub.length(); i < n; ++i) { for (int i = 0, n = stub.length(); i < n; ++i) {
final char c = stub.charAt(i); final char c = stub.charAt(i);
classname.append((((i == 0) && Character.isJavaIdentifierStart(c)) || ((i > 0) && Character.isJavaIdentifierPart(c)))? c: '_'); switch(i) {
case 0:
if(Character.isJavaIdentifierStart(c)) {
classname.append(c);
} else {
classname.append('_');
}
break;
default:
if(c == '/') {
classname.append(c);
} else if(Character.isJavaIdentifierPart(c)) {
classname.append(c);
} else {
classname.append('_');
}
break;
}
} }
return classname.toString(); return classname.toString();
} }
private static String toStandardLuaFileName( String luachunkname ) { private static String toStandardLuaFileName( String luachunkname ) {
String stub = toStub( luachunkname ); String stub = toStub( luachunkname );
String filename = stub.replace('.','/')+".lua"; String filename = stub.replace('.','/')+".lua";
return filename.startsWith("@")? filename.substring(1): filename; return filename.startsWith("@")? filename.substring(1): filename;
} }
private static String toStub( String s ) { private static String toStub( String s ) {
String stub = s.endsWith(".lua")? s.substring(0,s.length()-4): s; String stub = s.endsWith(".lua")? s.substring(0,s.length()-4): s;
return stub; return stub;
} }
} }

2
jse/src/test/java/org/luaj/vm2/libs/jse/LuajavaAccessibleMembersTest.java
View File

@@ -61,7 +61,7 @@ public class LuajavaAccessibleMembersTest extends TestCase {
} }
public void testAccessPublicEnum() { public void testAccessPublicEnum() {
assertEquals("class org.luaj.vm2.lib.jse.TestClass$SomeEnum", invokeScript( assertEquals("class org.luaj.vm2.libs.jse.TestClass$SomeEnum", invokeScript(
"b = luajava.newInstance('"+TestClass.class.getName()+"');" + "b = luajava.newInstance('"+TestClass.class.getName()+"');" +
"return b.SomeEnum")); "return b.SomeEnum"));
} }