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

Derive legal classname from filename.

Browse Source
This commit is contained in:
James Roseborough
2010-04-25 01:19:11 +00:00
parent 1b43352144
commit 90ca65c7d9
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/jse/lua.java
View File

@@ -32,7 +32,6 @@ import org.luaj.vm2.Lua;
import org.luaj.vm2.LuaFunction; import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaTable; import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue; import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Varargs;
import org.luaj.vm2.compiler.LuaC; import org.luaj.vm2.compiler.LuaC;
import org.luaj.vm2.lib.JsePlatform; import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.luajc.LuaJC; import org.luaj.vm2.luajc.LuaJC;

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

@@ -34,6 +34,8 @@ import org.luaj.vm2.compiler.LuaC;
public class LuaJC implements LuaCompiler { public class LuaJC implements LuaCompiler {
private static final String NON_IDENTIFIER = "[^a-zA-Z0-9_$]";
private static LuaJC instance; private static LuaJC instance;
private LuaC luac; private LuaC luac;
@@ -78,10 +80,12 @@ public class LuaJC implements LuaCompiler {
} }
public LuaFunction load(Prototype p, String filename, LuaValue env) { public LuaFunction load(Prototype p, String filename, LuaValue env) {
JavaGen gen = new JavaGen(p, filename, filename); String classname = filename.endsWith(".lua")? filename.substring(0,filename.length()-4): filename;
classname = classname.replaceAll(NON_IDENTIFIER, "_");
JavaGen gen = new JavaGen(p, classname, filename);
JavaLoader loader = new JavaLoader(env); JavaLoader loader = new JavaLoader(env);
loader.include(gen); loader.include(gen);
return (LuaFunction) loader.load(p, filename, filename); return (LuaFunction) loader.load(p, classname, filename);
} }
public LuaValue load(InputStream stream, String name, LuaValue env) throws IOException { public LuaValue load(InputStream stream, String name, LuaValue env) throws IOException {