diff src/luan/interp/LuanCompiler.java @ 49:8ede219cd111

add WebShell git-svn-id: https://luan-java.googlecode.com/svn/trunk@50 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Fri, 28 Dec 2012 19:35:04 +0000
parents 64ecb7a3aad7
children 851e356101c1
line wrap: on
line diff
--- a/src/luan/interp/LuanCompiler.java	Fri Dec 28 03:29:12 2012 +0000
+++ b/src/luan/interp/LuanCompiler.java	Fri Dec 28 19:35:04 2012 +0000
@@ -15,27 +15,18 @@
 public final class LuanCompiler {
 	private LuanCompiler() {}  // never
 
-	public static LuanFunction compile(LuanState lua,LuanSource src) throws LuanException {
+	public static LuanFunction compile(LuanState luan,LuanSource src) throws LuanException {
 		LuanParser parser = Parboiled.createParser(LuanParser.class);
 		parser.source = src;
 		ParsingResult<?> result = new ReportingParseRunner(parser.Target()).run(src.text);
 //		ParsingResult<?> result = new TracingParseRunner(parser.Target()).run(src);
 		if( result.hasErrors() )
-			throw new LuanException( lua, null, ErrorUtils.printParseErrors(result) );
-		Object resultValue = result.resultValue;
-		if( resultValue instanceof Expressions ) {
-			final Expressions expressions = (Expressions)resultValue;
-			return new LuanFunction() {
-				public Object[] call(LuanState lua,Object[] args) throws LuanException {
-					return expressions.eval((LuanStateImpl)lua);
-				}
-			};
-		}
-		Chunk chunk = (Chunk)resultValue;
-		return chunk.newClosure((LuanStateImpl)lua);
+			throw new LuanException( luan, null, ErrorUtils.printParseErrors(result) );
+		Chunk chunk = (Chunk)result.resultValue;
+		return new Closure((LuanStateImpl)luan,chunk);
 	}
 
-	public static LuanState newLuaState() {
+	public static LuanState newLuanState() {
 		return new LuanStateImpl();
 	}
 }