Mercurial Hosting > luan
diff src/luan/interp/LuanCompiler.java @ 104:754e6030c029
remove parboiled and rewrite parser;
add jline;
git-svn-id: https://luan-java.googlecode.com/svn/trunk@105 21e917c8-12df-6dd8-5cb6-c86387c605b9
| author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
|---|---|
| date | Mon, 12 May 2014 05:57:53 +0000 |
| parents | 1f8b6edc2b08 |
| children | 3c404a296995 |
line wrap: on
line diff
--- a/src/luan/interp/LuanCompiler.java Mon Mar 17 21:17:31 2014 +0000 +++ b/src/luan/interp/LuanCompiler.java Mon May 12 05:57:53 2014 +0000 @@ -1,16 +1,12 @@ package luan.interp; -import org.parboiled.Parboiled; -import org.parboiled.errors.ErrorUtils; -import org.parboiled.parserunners.ReportingParseRunner; -import org.parboiled.parserunners.TracingParseRunner; -import org.parboiled.support.ParsingResult; import luan.LuanFunction; import luan.LuanState; import luan.LuanException; import luan.LuanSource; import luan.LuanElement; import luan.LuanTable; +import luan.parser.ParseException; public final class LuanCompiler { @@ -18,16 +14,14 @@ 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 luan.COMPILER.exception( ErrorUtils.printParseErrors(result) ); + try { + FnDef fnDef = LuanParser.parse(src,envGetter); + return new Closure((LuanStateImpl)luan,fnDef); + } catch(ParseException e) { +//e.printStackTrace(); LuanElement le = new LuanSource.CompilerElement(src); - throw luan.bit(le).exception( ErrorUtils.printParseErrors(result) ); + throw luan.bit(le).exception( e.getFancyMessage() ); } - FnDef fnDef = (FnDef)result.resultValue; - return new Closure((LuanStateImpl)luan,fnDef); } public static LuanState newLuanState() {