Mercurial Hosting > luan

comparison src/luan/interp/LuanCompiler.java @ 91:1f8b6edc2b08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better error message git-svn-id: https://luan-java.googlecode.com/svn/trunk@92 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Thu, 07 Mar 2013 22:52:53 +0000
parents 6ca02b188dba
children 754e6030c029
comparison
equal deleted inserted replaced
90:b1e87f1bcc13 91:1f8b6edc2b08
19 public static LuanFunction compile(LuanState luan,LuanSource src,LuanTable env) throws LuanException { 19 public static LuanFunction compile(LuanState luan,LuanSource src,LuanTable env) throws LuanException {
20 UpValue.Getter envGetter = env!=null ? new UpValue.ValueGetter(env) : new UpValue.EnvGetter(); 20 UpValue.Getter envGetter = env!=null ? new UpValue.ValueGetter(env) : new UpValue.EnvGetter();
21 LuanParser parser = Parboiled.createParser(LuanParser.class,src,envGetter); 21 LuanParser parser = Parboiled.createParser(LuanParser.class,src,envGetter);
22 ParsingResult<?> result = new ReportingParseRunner(parser.Target()).run(src.text); 22 ParsingResult<?> result = new ReportingParseRunner(parser.Target()).run(src.text);
23 // ParsingResult<?> result = new TracingParseRunner(parser.Target()).run(src); 23 // ParsingResult<?> result = new TracingParseRunner(parser.Target()).run(src);
24 if( result.hasErrors() ) 24 if( result.hasErrors() ) {
25 throw luan.COMPILER.exception( ErrorUtils.printParseErrors(result) ); 25 // throw luan.COMPILER.exception( ErrorUtils.printParseErrors(result) );
26 LuanElement le = new LuanSource.CompilerElement(src);
27 throw luan.bit(le).exception( ErrorUtils.printParseErrors(result) );
28 }
26 FnDef fnDef = (FnDef)result.resultValue; 29 FnDef fnDef = (FnDef)result.resultValue;
27 return new Closure((LuanStateImpl)luan,fnDef); 30 return new Closure((LuanStateImpl)luan,fnDef);
28 } 31 }
29 32
30 public static LuanState newLuanState() { 33 public static LuanState newLuanState() {