Mercurial Hosting > luan
diff src/luan/interp/LuanCompiler.java @ 86:6db8f286fa6c
_ENV is per module, not global
git-svn-id: https://luan-java.googlecode.com/svn/trunk@87 21e917c8-12df-6dd8-5cb6-c86387c605b9
| author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
|---|---|
| date | Wed, 27 Feb 2013 08:03:51 +0000 |
| parents | 851e356101c1 |
| children | 6ca02b188dba |
line wrap: on
line diff
--- a/src/luan/interp/LuanCompiler.java Mon Feb 25 03:53:54 2013 +0000 +++ b/src/luan/interp/LuanCompiler.java Wed Feb 27 08:03:51 2013 +0000 @@ -10,20 +10,21 @@ import luan.LuanException; import luan.LuanSource; import luan.LuanElement; +import luan.LuanTable; public final class LuanCompiler { private LuanCompiler() {} // never - public static LuanFunction compile(LuanState luan,LuanSource src) throws LuanException { - LuanParser parser = Parboiled.createParser(LuanParser.class); - parser.source = src; + public static LuanFunction compile(LuanState luan,LuanSource src,LuanTable env) throws LuanException { + UpValue.Getter envGetter = env!=null ? new UpValue.ValueGetter(env) : new UpValue.EnvGetter(); + LuanParser parser = Parboiled.createParser(LuanParser.class,src,envGetter); ParsingResult<?> result = new ReportingParseRunner(parser.Target()).run(src.text); // ParsingResult<?> result = new TracingParseRunner(parser.Target()).run(src); if( result.hasErrors() ) throw new LuanException( luan, LuanElement.COMPILER, ErrorUtils.printParseErrors(result) ); - Chunk chunk = (Chunk)result.resultValue; - return new Closure((LuanStateImpl)luan,chunk); + FnDef fnDef = (FnDef)result.resultValue; + return new Closure((LuanStateImpl)luan,fnDef); } public static LuanState newLuanState() {