repo/luan: core/src/luan/impl/LuanParser.java comparison

comparison core/src/luan/impl/LuanParser.java @ 666:2f449ccf54d2

use lists to assemble source

author	Franklin Schmidt <fschmidt@gmail.com>
date	Thu, 07 Apr 2016 23:36:56 -0600
parents	41f8fdbc3a0a
children	08966099aa6d

comparison

equal deleted inserted replaced

-:41f8fdbc3a0a
+:2f449ccf54d2
 		return new ExpressionsExpr(exprs);
 	}
 	private FnDef newFnDef(int start,StmtString stmt) {
 		if( !stmt.hasReturn )
-			stmt = new StmtString( stmt.code + "return LuanFunction.NOTHING;\n" );
+			stmt.list.add( "return LuanFunction.NOTHING;\n" );
 		return toFnDef( stmt, frame.stackSize, symbolsSize(), frame.isVarArg, frame.upValueGetters.toArray(NO_UP_VALUE_GETTERS) );
 	}
 	private ExpString newFnExpStr(int start,StmtString stmt) {
 		if( !stmt.hasReturn )
-			stmt = new StmtString( stmt.code + "return LuanFunction.NOTHING;\n" );
+			stmt.list.add( "return LuanFunction.NOTHING;\n" );
 		return toFnExpStr( stmt, frame.stackSize, symbolsSize(), frame.isVarArg, frame.upValueGetters.toArray(NO_UP_VALUE_GETTERS) );
 	}
 	FnDef Expression() throws ParseException {
 		Spaces(In.NOTHING);
 		int start = parser.begin();
 		ExpString expr = ExprZ(In.NOTHING);
 		if( expr != null && parser.endOfInput() ) {
-			String code = "return " + expr.code + ";\n";
+			StmtString stmt = new StmtString();
-			StmtString stmt = new StmtString(code);
+			stmt.list.add( "return " );
+			stmt.list.addAll( expr.list );
+			stmt.list.add( ";\n" );
 			stmt.hasReturn = true;
 			return parser.success(newFnDef(start,stmt));
 		}
 		return parser.failure(null);
 	}
 			return parser.success(newFnDef(start,stmt));
 		throw parser.exception();
 	}
 	private StmtString RequiredBlock() throws ParseException {
-		StringBuilder stmts = new StringBuilder();
+		StmtString stmts = new StmtString();
 		int stackStart = symbolsSize();
 		boolean isReturn = Stmt(stmts);
 		while( !isReturn && StmtSep(stmts) ) {
 			Spaces(In.NOTHING);
 			isReturn = Stmt(stmts);
 		}
 		StmtSep(null);
 		Spaces(In.NOTHING);
 		int stackEnd = symbolsSize();
 		popSymbols( stackEnd - stackStart );
-		if( stmts.length() == 0 )
+		if( stmts.list.isEmpty() )
-			return EMPTY_STMT;
+			return stmts;
 		String code = stmts.toString();
-		if( stackStart < stackEnd )
+		if( stackStart < stackEnd ) {
-			code = ""
+			stmts.list.add( 0, "try {\n" );
-				+"try {\n"
+			stmts.list.add( ""
-				+ code
 				+"} finally {\n"
 				+"	luan.stackClear("+stackStart+","+stackEnd+");\n"
 				+"}\n"
-			;
+			);
-		StmtString stmt = new StmtString(code);
+		}
-		stmt.hasReturn = isReturn;
+		stmts.hasReturn = isReturn;
-		return stmt;
+		return stmts;
 	}
-	private boolean StmtSep(StringBuilder stmts) throws ParseException {
+	private boolean StmtSep(StmtString stmts) throws ParseException {
 		parser.begin();
 		if( parser.match( ';' ) )
 			return parser.success();
 		if( EndOfLine() )
 			return parser.success();
 		if( stmts != null ) {
 //			parser.rollback();
 			StmtString stmt = TemplateStmt();
 			if( stmt != null ) {
-				stmts.append(stmt.code);
+				stmts.list.addAll(stmt.list);
 				return parser.success();
 			}
 		}
 		return parser.failure();
 	}
 	private boolean EndOfLine() {
 		return parser.match( "\r\n" ) || parser.match( '\r' ) || parser.match( '\n' );
 	}
-	private boolean Stmt(StringBuilder stmts) throws ParseException {
+	private boolean Stmt(StmtString stmts) throws ParseException {
 		if( LocalStmt(stmts) )
 			return false;
 		StmtString stmt;
 		if( (stmt=ReturnStmt()) != null ) {
-			stmts.append(stmt.code);
+			stmts.list.addAll(stmt.list);
 			return true;
 		}
 		if( (stmt=FunctionStmt()) != null
 			|| (stmt=LocalFunctionStmt()) != null
 			|| (stmt=BreakStmt()) != null
 			|| (stmt=RepeatStmt()) != null
 			|| (stmt=IfStmt()) != null
 			|| (stmt=SetStmt()) != null
 			|| (stmt=ExpressionsStmt()) != null
 		) {
-			stmts.append(stmt.code);
+			stmts.list.addAll(stmt.list);
 		}
 		return false;
 	}
 	private ExpString indexExpStr(ExpString exp1,ExpString exp2) {
-		String code = "luan.index(" + exp1.expr().code + "," + exp2.expr().code + ")";
+		ExpString exp = new ExpString(true,false);
-		return new ExpString(code,true,false);
+		exp.list.add( "luan.index(" );
+		exp.list.addAll( exp1.expr().list );
+		exp.list.add( "," );
+		exp.list.addAll( exp2.expr().list );
+		exp.list.add( ")" );
+		return exp;
 	}
 	private ExpString callExpStr(ExpString fn,ExpString args) {
-		String code = "Luan.checkFunction(" + fn.expr().code + ").call(luan,Luan.array(" + args.code + "))";
+		ExpString exp = new ExpString(false,true);
-		return new ExpString(code,false,true);
+		exp.list.add( "Luan.checkFunction(" );
+		exp.list.addAll( fn.expr().list );
+		exp.list.add( ").call(luan,Luan.array(" );
+		exp.list.addAll( args.list );
+		exp.list.add( "))" );
+		return exp;
 	}
 	private StmtString TemplateStmt() throws ParseException {
 		ExpString exprs = TemplateExpressions(In.NOTHING);
 		if( exprs == null )
 			return null;
-		String code = "PackageLuan.require(luan,\"luan:Io\")";
+		ExpString requireCall = new ExpString(true,false);
-		ExpString requireCall = new ExpString(code,true,false);
+		requireCall.list.add( "PackageLuan.require(luan,\"luan:Io\")" );
 		ExpString stdoutExp = indexExpStr( requireCall.expr(), constExpStr("stdout") );
 		ExpString writeExp = indexExpStr( stdoutExp, constExpStr("write") );
 		ExpString writeCall = callExpStr( writeExp, exprs );
-		return new StmtString( writeCall.code + ";\n" );
+		StmtString stmt = new StmtString();
+		stmt.list.addAll( writeCall.list );
+		stmt.list.add( ";\n" );
+		return stmt;
 	}
 	private ExpString TemplateExpressions(In in) throws ParseException {
 		if( in.template )
 			return null;
 	private StmtString ReturnStmt() throws ParseException {
 		parser.begin();
 		if( !Keyword("return",In.NOTHING) )
 			return parser.failure(null);
 		ExpString exprs = ExpStringList(In.NOTHING);
-		String code = "return " + (exprs!=null ? exprs.code : "LuanFunction.NOTHING") + ";\n";
+		StmtString stmt = new StmtString();
-		return parser.success( new StmtString(code) );
+		stmt.list.add( "return " );
+		if( exprs != null )
+			stmt.list.addAll( exprs.list );
+		else
+			stmt.list.add( "LuanFunction.NOTHING" );
+		stmt.list.add( ";\n" );
+		return parser.success( stmt );
 	}
 	private StmtString FunctionStmt() throws ParseException {
 		parser.begin();
 		if( !Keyword("function",In.NOTHING) )
 			return parser.failure(null);
 		String name = RequiredName(In.NOTHING);
 		addSymbol( name );
 		ExpString fnDef = RequiredFunction(In.NOTHING);
 		Settable s = new SetLocalVar(symbolsSize()-1);
-		String code = new SettableString(s).code + ".set(luan," + fnDef.code + ");\n";
+		StmtString stmt = new StmtString();
-		return parser.success( new StmtString(code) );
+		stmt.list.add( settableToString(s) );
+		stmt.list.add( ".set(luan," );
+		stmt.list.addAll( fnDef.list );
+		stmt.list.add( ");\n" );
+		return parser.success( stmt );
 	}
 	private StmtString BreakStmt() throws ParseException {
 		parser.begin();
 		if( !Keyword("break",In.NOTHING) )
 			return parser.failure(null);
 		if( frame.loops <= 0 )
 			throw parser.exception("'break' outside of loop");
-		return parser.success( new StmtString("break;\n") );
+		StmtString stmt = new StmtString();
+		stmt.list.add( "break;\n" );
+		return parser.success( stmt );
 	}
 	int forCounter = 0;
 	private StmtString ForStmt() throws ParseException {
 		ExpString firstVar = new ExpString(new GetLocalVar(stackStart));
 		addSymbols(names);
 		StmtString loop = RequiredLoopBlock();
 		RequiredKeyword("end",In.NOTHING);
 		String fnVar = "fn"+ ++forCounter;
-		String code = ""
+		StmtString stmt = new StmtString();
+		stmt.list.add( ""
 			+"try {\n"
-			+"LuanFunction "+fnVar+" = Luan.checkFunction(" + expr.code + ");\n"
+			+"LuanFunction "+fnVar+" = Luan.checkFunction("
+		);
+		stmt.list.addAll( expr.list );
+		stmt.list.add( ""
+			+ ");\n"
 			+"while(true) {\n"
 			+"for( int i="+stackStart+"; i<"+symbolsSize()+"; i++ ) {\n"
 			+"luan.stackSet(i,null);\n"
 			+"}\n"
 			+"LuanImpl.set(luan," + varsStr + ", "+fnVar+".call(luan) );\n"
-			+"if( " + firstVar.code + "==null )  break;\n"
+			+"if( "
-			+ loop.code
+		);
+		stmt.list.addAll( firstVar.list );
+		stmt.list.add( "==null )  break;\n" );
+		stmt.list.addAll( loop.list );
+		stmt.list.add( ""
 			+"}"
 			+"} finally {\n"
 			+"luan.stackClear("+stackStart+","+symbolsSize()+");\n"
 			+"}\n"
-		;
+		);
-		StmtString stmt = new StmtString(code);
 		popSymbols( symbolsSize() - stackStart );
 		return parser.success(stmt);
 	}
 	private StmtString DoStmt() throws ParseException {
 		StmtString stmt = RequiredBlock();
 		RequiredKeyword("end",In.NOTHING);
 		return parser.success(stmt);
 	}
-	private boolean LocalStmt(StringBuilder stmts) throws ParseException {
+	private boolean LocalStmt(StmtString stmts) throws ParseException {
 		parser.begin();
 		if( !Keyword("local",In.NOTHING) )
 			return parser.failure();
 		List<String> names = NameList(In.NOTHING);
 		if( names==null ) {
 			int stackStart = symbolsSize();
 			for( int i=0; i<vars.length; i++ ) {
 				vars[i] = new SetLocalVar(stackStart+i);
 			}
 			String varsStr = varsToString(vars);
-			String code = "LuanImpl.set(luan," + varsStr + "," + values.code + ");\n";
+			stmts.list.add( "LuanImpl.set(luan," + varsStr + "," );
-			stmts.append(code);
+			stmts.list.addAll( values.list );
+			stmts.list.add( ");\n" );
 		}
 		addSymbols(names);
 		return parser.success();
 	}
 			return parser.failure(null);
 		ExpString cnd = RequiredExpr(In.NOTHING).expr();
 		RequiredKeyword("do",In.NOTHING);
 		StmtString loop = RequiredLoopBlock();
 		RequiredKeyword("end",In.NOTHING);
-		String code = ""
+		StmtString stmt = new StmtString();
-			+"while( Luan.checkBoolean(" + cnd.code + ") ) {\n"
+		stmt.list.add( "while( Luan.checkBoolean(" );
-			+ loop.code
+		stmt.list.addAll( cnd.list );
-			+"}\n"
+		stmt.list.add( ") ) {\n" );
-		;
+		stmt.list.addAll( loop.list );
-		return parser.success( new StmtString(code) );
+		stmt.list.add( "}\n" );
+		return parser.success( stmt );
 	}
 	private StmtString RepeatStmt() throws ParseException {
 		parser.begin();
 		if( !Keyword("repeat",In.NOTHING) )
 			return parser.failure(null);
 		StmtString loop =RequiredLoopBlock();
 		RequiredKeyword("until",In.NOTHING);
 		ExpString cnd = RequiredExpr(In.NOTHING).expr();
-		String code = ""
+		StmtString stmt = new StmtString();
-			+"do {\n"
+		stmt.list.add( "do {\n" );
-			+ loop.code
+		stmt.list.addAll( loop.list );
-			+"} while( !Luan.checkBoolean(" + cnd.code + ") );\n"
+		stmt.list.add( "} while( !Luan.checkBoolean(" );
-		;
+		stmt.list.addAll( cnd.list );
-		return parser.success( new StmtString(code) );
+		stmt.list.add( ") );\n" );
+		return parser.success( stmt );
 	}
 	private StmtString RequiredLoopBlock() throws ParseException {
 		incLoops();
 		StmtString stmt = RequiredBlock();
 	private StmtString IfStmt() throws ParseException {
 		parser.begin();
 		if( !Keyword("if",In.NOTHING) )
 			return parser.failure(null);
-		StringBuilder sb = new StringBuilder();
+		StmtString stmt = new StmtString();
 		ExpString cnd;
 		StmtString block;
 		cnd = RequiredExpr(In.NOTHING).expr();
 		RequiredKeyword("then",In.NOTHING);
 		block = RequiredBlock();
-		sb.append( "if( Luan.checkBoolean(" ).append( cnd.code ).append( ") ) {\n" ).append( block.code );
+		stmt.list.add( "if( Luan.checkBoolean(" );
+		stmt.list.addAll( cnd.list );
+		stmt.list.add( ") ) {\n" );
+		stmt.list.addAll( block.list );
 		while( Keyword("elseif",In.NOTHING) ) {
 			cnd = RequiredExpr(In.NOTHING).expr();
 			RequiredKeyword("then",In.NOTHING);
 			block = RequiredBlock();
-			sb.append( "} else if( Luan.checkBoolean(" ).append( cnd.code ).append( ") ) {\n" ).append( block.code );
+			stmt.list.add( "} else if( Luan.checkBoolean(" );
+			stmt.list.addAll( cnd.list );
+			stmt.list.add( ") ) {\n" );
+			stmt.list.addAll( block.list );
 		}
 		if( Keyword("else",In.NOTHING) ) {
 			block = RequiredBlock();
-			sb.append( "} else {\n" ).append( block.code );
+			stmt.list.add( "} else {\n" );
+			stmt.list.addAll( block.list );
 		}
 		RequiredKeyword("end",In.NOTHING);
-		sb.append( "}\n" );
+		stmt.list.add( "}\n" );
-		return parser.success( new StmtString(sb.toString()) );
+		return parser.success( stmt );
 	}
 	private StmtString SetStmt() throws ParseException {
 		parser.begin();
 		List<Var> vars = new ArrayList<Var>();
 //			throw parser.exception("Expressions expected");
 			return parser.failure(null);
 		int n = vars.size();
 		if( n == 1 )
 			return parser.success( vars.get(0).set(values) );
-		StringBuilder sb = new StringBuilder();
+		StmtString stmt = new StmtString();
-		sb.append( "t = " + values.code + ";\n" );
+		stmt.list.add( "t = " );
-		ExpString t = new ExpString("t",true,false);
+		stmt.list.addAll( values.list );
-		sb.append( vars.get(0).set(new ExpString("t",true,false)).code );
+		stmt.list.add( ";\n" );
+		ExpString t = new ExpString(true,false);
+		t.list.add( "t" );
+		stmt.list.addAll( vars.get(0).set(t).list );
 		for( int i=1; i<n; i++ ) {
-			sb.append( vars.get(i).set(new ExpString("LuanImpl.pick(t,"+i+")",true,false)).code );
+			t.list.clear();
-		}
+			t.list.add( "LuanImpl.pick(t,"+i+")" );
-		return parser.success( new StmtString(sb.toString()) );
+			stmt.list.addAll( vars.get(i).set(t).list );
+		}
+		return parser.success( stmt );
 	}
 	private static String varsToString(Settable[] vars) {
 		StringBuilder sb = new StringBuilder();
 		sb.append( "new Settable[]{" );
 		for( Settable v : vars ) {
-			sb.append( new SettableString(v).code ).append( ',' );
+			sb.append( settableToString(v) ).append( ',' );
 		}
 		sb.append( "}" );
 		return sb.toString();
 	}
 	private StmtString ExpressionsStmt() throws ParseException {
 		parser.begin();
 		ExpString exp = ExprZ(In.NOTHING);
 		if( exp != null && exp.isStmt ) {
-			String code = exp.code;
+			StmtString stmt = new StmtString();
-			if( exp.isExpr )
+			if( exp.isExpr ) {
-				code = "LuanImpl.nop(" + code + ")";
+				stmt.list.add( "LuanImpl.nop(" );
-			code += ";\n";
+				stmt.list.addAll( exp.list );
-			return parser.success( new StmtString(code) );
+				stmt.list.add( ")" );
+			} else {
+				stmt.list.addAll( exp.list );
+			}
+			stmt.list.add( ";\n" );
+			return parser.success( stmt );
 		}
 		return parser.failure(null);
 	}
 	private Var SettableVar() throws ParseException {
 		if( exp==null )
 			return parser.failure(null);
 		while( Keyword("or",in) ) {
 			exp = exp.expr();
 			ExpString exp2 = required(RelExpr(in)).expr();
-			String code = "(LuanImpl.cnd(t = " + exp.code + ") ? t : (" + exp2.code + "))";
+			ExpString newExp = new ExpString(true,true);
-			exp = new ExpString(code,true,true);
+			newExp.list.add( "(LuanImpl.cnd(t = " );
+			newExp.list.addAll( exp.list );
+			newExp.list.add( ") ? t : (" );
+			newExp.list.addAll( exp2.list );
+			newExp.list.add( "))" );
+			exp = newExp;
 		}
 		return parser.success(exp);
 	}
 	private ExpString AndExpr(In in) throws ParseException {
 		if( exp==null )
 			return parser.failure(null);
 		while( Keyword("and",in) ) {
 			exp = exp.expr();
 			ExpString exp2 = required(RelExpr(in)).expr();
-			String code = "(LuanImpl.cnd(t = " + exp.code + ") ? (" + exp2.code + ") : t)";
+			ExpString newExp = new ExpString(true,true);
-			exp = new ExpString(code,true,true);
+			newExp.list.add( "(LuanImpl.cnd(t = " );
+			newExp.list.addAll( exp.list );
+			newExp.list.add( ") ? (" );
+			newExp.list.addAll( exp2.list );
+			newExp.list.add( ") : t)" );
+			exp = newExp;
 		}
 		return parser.success(exp);
 	}
 	private ExpString RelExpr(In in) throws ParseException {
 		while(true) {
 			if( parser.match("==") ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(ConcatExpr(in)).expr();
-				String code = "LuanImpl.eq(luan," + exp.code + "," + exp2.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.eq(luan," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else if( parser.match("~=") ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(ConcatExpr(in)).expr();
-				String code = "!LuanImpl.eq(luan," + exp.code + "," + exp2.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "!LuanImpl.eq(luan," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else if( parser.match("<=") ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(ConcatExpr(in)).expr();
-				String code = "LuanImpl.le(luan," + exp.code + "," + exp2.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.le(luan," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else if( parser.match(">=") ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(ConcatExpr(in)).expr();
-				String code = "LuanImpl.le(luan," + exp2.code + "," + exp.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.le(luan," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else if( parser.match("<") ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(ConcatExpr(in)).expr();
-				String code = "LuanImpl.lt(luan," + exp.code + "," + exp2.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.lt(luan," );
-		} else if( parser.match(">") ) {
+				newExp.list.addAll( exp.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( ")" );
+				exp = newExp;
+			} else if( parser.match(">") ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(ConcatExpr(in)).expr();
-				String code = "LuanImpl.lt(luan," + exp2.code + "," + exp.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.lt(luan," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else
 				break;
 		}
 		return parser.success(exp);
 	}
 			return parser.failure(null);
 		if( parser.match("..") ) {
 			Spaces(in);
 			exp = exp.expr();
 			ExpString exp2 = required(ConcatExpr(in)).expr();
-			String code = "LuanImpl.concat(luan," + exp.code + "," + exp2.code + ")";
+			ExpString newExp = new ExpString(true,false);
-			exp = new ExpString(code,true,false);
+			newExp.list.add( "LuanImpl.concat(luan," );
+			newExp.list.addAll( exp.list );
+			newExp.list.add( "," );
+			newExp.list.addAll( exp2.list );
+			newExp.list.add( ")" );
+			exp = newExp;
 		}
 		return parser.success(exp);
 	}
 	private ExpString SumExpr(In in) throws ParseException {
 		while(true) {
 			if( parser.match('+') ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(TermExpr(in)).expr();
-				String code = "LuanImpl.add(luan," + exp.code + "," + exp2.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.add(luan," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else if( Minus() ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(TermExpr(in)).expr();
-				String code = "LuanImpl.sub(luan," + exp.code + "," + exp2.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.sub(luan," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else
 				break;
 		}
 		return parser.success(exp);
 	}
 		while(true) {
 			if( parser.match('*') ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(UnaryExpr(in)).expr();
-				String code = "LuanImpl.mul(luan," + exp.code + "," + exp2.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.mul(luan," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else if( parser.match('/') ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(UnaryExpr(in)).expr();
-				String code = "LuanImpl.div(luan," + exp.code + "," + exp2.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.div(luan," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else if( Mod() ) {
 				Spaces(in);
 				exp = exp.expr();
 				ExpString exp2 = required(UnaryExpr(in)).expr();
-				String code = "LuanImpl.mod(luan," + exp.code + "," + exp2.code + ")";
+				ExpString newExp = new ExpString(true,false);
-				exp = new ExpString(code,true,false);
+				newExp.list.add( "LuanImpl.mod(luan," );
+				newExp.list.addAll( exp.list );
+				newExp.list.add( "," );
+				newExp.list.addAll( exp2.list );
+				newExp.list.add( ")" );
+				exp = newExp;
 			} else
 				break;
 		}
 		return parser.success(exp);
 	}
 	private ExpString UnaryExpr(In in) throws ParseException {
 		parser.begin();
 		if( parser.match('#') ) {
 			Spaces(in);
 			ExpString exp = required(UnaryExpr(in)).expr();
-			String code = "LuanImpl.len(luan," + exp.code + ")";
+			ExpString newExp = new ExpString(true,false);
-			exp = new ExpString(code,true,false);
+			newExp.list.add( "LuanImpl.len(luan," );
-			return parser.success(exp);
+			newExp.list.addAll( exp.list );
+			newExp.list.add( ")" );
+			return parser.success(newExp);
 		}
 		if( Minus() ) {
 			Spaces(in);
 			ExpString exp = required(UnaryExpr(in)).expr();
-			String code = "LuanImpl.unm(luan," + exp.code + ")";
+			ExpString newExp = new ExpString(true,false);
-			exp = new ExpString(code,true,false);
+			newExp.list.add( "LuanImpl.unm(luan," );
-			return parser.success(exp);
+			newExp.list.addAll( exp.list );
+			newExp.list.add( ")" );
+			return parser.success(newExp);
 		}
 		if( Keyword("not",in) ) {
 			Spaces(in);
 			ExpString exp = required(UnaryExpr(in)).expr();
-			String code = "!Luan.checkBoolean(" + exp.code + ")";
+			ExpString newExp = new ExpString(true,false);
-			exp = new ExpString(code,true,false);
+			newExp.list.add( "!Luan.checkBoolean(" );
-			return parser.success(exp);
+			newExp.list.addAll( exp.list );
+			newExp.list.add( ")" );
+			return parser.success(newExp);
 		}
 		ExpString exp = PowExpr(in);
 		if( exp==null )
 			return parser.failure(null);
 		return parser.success(exp);
 		if( exp1==null )
 			return parser.failure(null);
 		if( parser.match('^') ) {
 			Spaces(in);
 			ExpString exp2 = required(PowExpr(in));
-			String code = "LuanImpl.pow(luan," + exp1.code + "," + exp2.code + ")";
+			ExpString newExp = new ExpString(true,false);
-			exp1 = new ExpString(code,true,false);
+			newExp.list.add( "LuanImpl.pow(luan," );
+			newExp.list.addAll( exp1.expr().list );
+			newExp.list.add( "," );
+			newExp.list.addAll( exp2.expr().list );
+			newExp.list.add( ")" );
+			exp1 = newExp;
 		}
 		return parser.success(exp1);
 	}
 	private ExpString SingleExpr(In in) throws ParseException {
 		if( exp != null )
 			builder.add(exp);
 		if( !parser.match('}') )
 			throw parser.exception("Expected table element or '}'");
 		Spaces(in);
-		String code = "LuanImpl.table(" + expString(builder).code + ")";
+		exp = new ExpString(true,false);
-		return parser.success( new ExpString(code,true,false) );
+		exp.list.add( "LuanImpl.table(" );
+		exp.list.addAll( expString(builder).list );
+		exp.list.add( ")" );
+		return parser.success( exp );
 	}
 	private boolean FieldSep() throws ParseException {
 		return parser.anyOf(",;") || EndOfLine();
 	}
 		if( exp==null )
 			exp = NameExpr(In.NOTHING);
 		if( exp!=null && parser.match('=') ) {
 			Spaces(In.NOTHING);
 			ExpString val = RequiredExpr(In.NOTHING).expr();
-			String code = "new TableField(" + exp.code + "," + val.code + ")";
+			ExpString newExp = new ExpString(true,false);
-			builder.add( new ExpString(code,true,false) );
+			newExp.list.add( "new TableField(" );
+			newExp.list.addAll( exp.list );
+			newExp.list.add( "," );
+			newExp.list.addAll( val.list );
+			newExp.list.add( ")" );
+			builder.add( newExp );
 			return parser.success();
 		}
 		parser.rollback();
 		ExpString exprs = ExprZ(In.NOTHING);
 		if( exprs != null ) {
 				parser.failure(null);
 				throw parser.exception("name '"+name+"' not defined");
 			}
 			public StmtString set(ExpString val) throws ParseException {
-				String code = new SettableString(settable()).code + ".set(luan," + val.expr().code + ");\n";
+				StmtString stmt = new StmtString();
-				return new StmtString(code);
+				stmt.list.add( settableToString(settable()) + ".set(luan," );
+				stmt.list.addAll( val.expr().list );
+				stmt.list.add( ");\n" );
+				return stmt;
 			}
 		};
 	}
 	private Var exprVar(final ExpString expr) {
 			public Settable settable() {
 				return new SetTableEntry(expr(LuanParser.exp(table)),expr(LuanParser.exp(key)));
 			}
 */
 			public StmtString set(ExpString val) {
-				String code = "LuanImpl.put(luan," + table.expr().code + "," + key.expr().code + "," + val.expr().code + ");\n";
+				StmtString stmt = new StmtString();
-				return new StmtString(code);
+				stmt.list.add( "LuanImpl.put(luan," );
+				stmt.list.addAll( table.expr().list );
+				stmt.list.add( "," );
+				stmt.list.addAll( key.expr().list );
+				stmt.list.add( "," );
+				stmt.list.addAll( val.expr().list );
+				stmt.list.add( ");\n" );
+				return stmt;
 			}
 		};
 	}
 	private ExpString Args(In in,ExpString fn,List<ExpString> builder) throws ParseException {
 		"while"
 	));
 	private ExpString Literal(In in) throws ParseException {
 		parser.begin();
-		if( NilLiteral(in) )
+		if( NilLiteral(in) ) {
-			return parser.success(new ExpString("null",true,false));
+			ExpString exp = new ExpString(true,false);
+			exp.list.add( "null" );
+			return parser.success(exp);
+		}
 		Boolean b = BooleanLiteral(in);
-		if( b != null )
+		if( b != null ) {
-			return parser.success(new ExpString(b.toString(),true,false));
+			ExpString exp = new ExpString(true,false);
+			exp.list.add( b.toString() );
+			return parser.success(exp);
+		}
 		Number n = NumberLiteral(in);
 		if( n != null ) {
 			String s = n.toString();
 			if( n instanceof Long )
 				s += "L";
-			return parser.success(new ExpString(s,true,false));
+			ExpString exp = new ExpString(true,false);
+			exp.list.add( s );
+			return parser.success(exp);
 		}
 		String s = StringLiteral(in);
 		if( s != null )
 			return parser.success(constExpStr(s));
 		return parser.failure(null);
 			.replace("\n","\\n")
 			.replace("\r","\\r")
 			.replace("\t","\\t")
 			.replace("\b","\\b")
 		;
-		return new ExpString( "\""+s+"\"", true,false);
+		ExpString exp = new ExpString(true,false);
+		exp.list.add( "\""+s+"\"" );
+		return exp;
 	}
 	private boolean NilLiteral(In in) throws ParseException {
 		return Keyword("nil",in);
 	}
 	private static int classCounter = 0;
 	private class ExpString {
-		final String code;
+		final List list = new ArrayList();
 		final boolean isExpr;
 		final boolean isStmt;
 		ExpString(Expressions exp) {
 			if( exp==null )  throw new NullPointerException();
 			int i = LuanImpl.addObj(exp);
-			code = "((Expressions)LuanImpl.getObj(" + i + ")).eval(luan)";
+			list.add( "((Expressions)LuanImpl.getObj(" + i + ")).eval(luan)" );
 			isExpr = exp instanceof Expr;
 			isStmt = exp instanceof StmtExp;
 		}
-		ExpString(String code,boolean isExpr,boolean isStmt) {
+		ExpString(boolean isExpr,boolean isStmt) {
-			this.code = code;
 			this.isExpr = isExpr;
 			this.isStmt = isStmt;
 		}
 		ExpString expr() {
-			return isExpr ? this : new ExpString( "Luan.first(" + code + ")", true, isStmt );
+			if( isExpr )
+				return this;
+			ExpString exp = new ExpString(true,isStmt);
+			exp.list.addAll( list );
+			return exp;
 		}
 	}
 	private ExpString expString(List<ExpString> list) {
+		ExpString exp = new ExpString(false,false);
 		switch(list.size()) {
 		case 0:
-			return new ExpString("LuanFunction.NOTHING",false,false);
+			exp.list.add("LuanFunction.NOTHING");
+			return exp;
 		case 1:
 			return list.get(0);
 		default:
 			int lastI = list.size() - 1;
-			StringBuilder sb = new StringBuilder();
+			exp.list.add( "new Object[]{" );
-			sb.append( "new Object[]{" );
 			for( int i=0; i<lastI; i++ ) {
-				sb.append( list.get(i).expr().code ).append( ',' );
+				exp.list.addAll( list.get(i).expr().list );
+				exp.list.add( "," );
 			}
 			ExpString last = list.get(lastI);
 			if( last.isExpr ) {
-				sb.append( last.code ).append( '}' );
+				exp.list.addAll( last.list );
-				return new ExpString(sb.toString(),false,false);
+				exp.list.add( "}" );
 			} else {
-				sb.append( '}' );
+				exp.list.add( "}" );
-				String s = "LuanImpl.concatArgs(" + sb + "," + last.code + ")";
+				exp.list.add( 0, "LuanImpl.concatArgs(" );
-				return new ExpString(s,false,false);
+				exp.list.add( "," );
-			}
+				exp.list.addAll( last.list );
+				exp.list.add( ")" );
+			}
+			return exp;
 		}
 	}
 	private static class StmtString {
-		final String code;
+		final List list = new ArrayList();
 		boolean hasReturn = false;
+	}
-		StmtString(String code) {
-			this.code = code;
-			if( code.contains("LuanParser") )  throw new RuntimeException("\n"+code);
-		}
-	}
-	private static StmtString EMPTY_STMT = new StmtString("");
 	private static FnDef toFnDef(StmtString stmt,int stackSize,int numArgs,boolean isVarArg,UpValue.Getter[] upValueGetters) {
+		StringBuilder sb = new StringBuilder();
+		for( Object o : stmt.list ) {
+			if( o instanceof List )  throw new RuntimeException();
+			if( o instanceof ExpString )  throw new RuntimeException();
+			if( o instanceof StmtString )  throw new RuntimeException();
+			sb.append( o.toString() );
+		}
+		String code = sb.toString();
+//System.out.println("code:\n"+code);
 		int i = LuanImpl.addObj(upValueGetters);
 		String className = "EXP" + ++classCounter;
 		String classCode = ""
 			+"package luan.impl;\n"
 			+"import luan.Luan;\n"
 			+"		super("+stackSize+","+numArgs+","+isVarArg+",(UpValue.Getter[])LuanImpl.getObj("+i+"));\n"
 			+"	}\n"
 			+"\n"
 			+"	@Override public Object run(LuanStateImpl luan) throws LuanException {\n"
 			+"		Object t;\n"
-			+"		" + stmt.code
+			+"		" + code
 			+"	}\n"
 			+"}\n"
 		;
 		try {
 //System.out.println(classCode);
 		}
 	}
 	private ExpString toFnExpStr(StmtString stmt,int stackSize,int numArgs,boolean isVarArg,UpValue.Getter[] upValueGetters) {
 		int i = LuanImpl.addObj(upValueGetters);
-		String classCode = ""
+		ExpString exp = new ExpString(true,false);
+		exp.list.add( ""
 			+"\n"
 			+"new FnDef("+stackSize+","+numArgs+","+isVarArg+",(UpValue.Getter[])LuanImpl.getObj("+i+")) {\n"
 			+"	@Override public Object run(LuanStateImpl luan) throws LuanException {\n"
 			+"		Object t;\n"
-			+"		" + stmt.code
+			+"		"
+		);
+		exp.list.addAll( stmt.list );
+		exp.list.add( ""
 			+"	}\n"
 			+"}.eval(luan)\n"
-		;
+		);
-		return new ExpString(classCode,true,false);
+		return exp;
 	}
-	private static class SettableString {
+	private static String settableToString(Settable settable) {
-		final String code;
+		if( settable==null )  throw new NullPointerException();
+		int i = LuanImpl.addObj(settable);
-		SettableString(Settable settable) {
+		return"((Settable)LuanImpl.getObj(" + i + "))";
-			if( settable==null )  throw new NullPointerException();
-			int i = LuanImpl.addObj(settable);
-			code = "((Settable)LuanImpl.getObj(" + i + "))";
-		}
-		SettableString(String code) {
-			this.code = code;
-		}
 	}
 }

Mercurial Hosting > luan

comparison core/src/luan/impl/LuanParser.java @ 666:2f449ccf54d2