Mercurial Hosting > luan
changeset 675:d95caff8ba8c
minor
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Tue, 12 Apr 2016 19:41:26 -0600 |
parents | 2994e46f62b7 |
children | 1b6a0dc0ea16 |
files | core/src/luan/impl/LuanCompiler.java core/src/luan/impl/LuanParser.java core/src/luan/modules/BasicLuan.java |
diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
diff -r 2994e46f62b7 -r d95caff8ba8c core/src/luan/impl/LuanCompiler.java --- a/core/src/luan/impl/LuanCompiler.java Tue Apr 12 19:31:18 2016 -0600 +++ b/core/src/luan/impl/LuanCompiler.java Tue Apr 12 19:41:26 2016 -0600 @@ -14,7 +14,7 @@ public final class LuanCompiler { private LuanCompiler() {} // never - public static LuanFunction compile(LuanState luan,String sourceName,String sourceText,LuanTable env,boolean allowExpr) throws LuanException { + public static LuanFunction compile(String sourceName,String sourceText,LuanTable env,boolean allowExpr) throws LuanException { LuanParser parser = new LuanParser(sourceName,sourceText); parser.addVar( "java" ); parser.addVar( "require" ); @@ -32,7 +32,7 @@ } Closure closure; try { - closure = (Closure)fnClass.getConstructor(LuanState.class,LuanJava.class).newInstance(luan,java); + closure = (Closure)fnClass.getConstructor(LuanJava.class).newInstance(java); } catch(NoSuchMethodException e) { throw new RuntimeException(e); } catch(InstantiationException e) {
diff -r 2994e46f62b7 -r d95caff8ba8c core/src/luan/impl/LuanParser.java --- a/core/src/luan/impl/LuanParser.java Tue Apr 12 19:31:18 2016 -0600 +++ b/core/src/luan/impl/LuanParser.java Tue Apr 12 19:41:26 2016 -0600 @@ -1849,7 +1849,7 @@ +"import luan.modules.PackageLuan;\n" +"\n" +"public class " + className +" extends Closure {\n" - +" public "+className+"(LuanState luan,LuanJava java) throws LuanException {\n" + +" public "+className+"(LuanJava java) throws LuanException {\n" +" super("+upValueSymbols.size()+",java);\n" + init(upValueSymbols) +" }\n"
diff -r 2994e46f62b7 -r d95caff8ba8c core/src/luan/modules/BasicLuan.java --- a/core/src/luan/modules/BasicLuan.java Tue Apr 12 19:31:18 2016 -0600 +++ b/core/src/luan/modules/BasicLuan.java Tue Apr 12 19:41:26 2016 -0600 @@ -30,7 +30,7 @@ { if( allowExpr==null ) allowExpr = false; - return LuanCompiler.compile(luan,sourceName,text,env,allowExpr); + return LuanCompiler.compile(sourceName,text,env,allowExpr); } public static LuanFunction load_theme(LuanState luan,String text,String sourceName)