Add stringcall transpile support, ifeif chains in parser

* Stringcalls for lua transpiler (will always use _G)
* Implemented ifeif chains for the parser and lua transpiler

Author: vurvdev

script.e2

@@ -13,6 +13,18 @@ while(1) {
 	print("while true do end")
 }
 
+"helloworld"()
+
+if(1) {
+	print("hi")
+} elseif(2) {
+	print("no")
+} elseif(3) {
+	print("bye")
+} else {
+	print("else")
+}
+
 Var = 500
 switch (Var) {
 	case 500,

src/Base/Parser.hx

@@ -322,17 +322,31 @@ class Parser {
 		return null;
 	}
 
-	function acceptIfElseIf() {
-		if (this.acceptRoamingToken("keyword", "elseif"))
-			return this.instruction( this.getTokenTrace(), "if", [this.acceptCondition(), this.acceptBlock("else if condition"), true, this.acceptIfElseIf()] );
+	function acceptIfElseIf(): Array<Instruction> {
+		var args = [];
+		while (true) {
+			if (this.acceptRoamingToken("keyword", "elseif")) {
+				args.push(
+					this.instruction(this.getTokenTrace(), "if", [this.acceptCondition(), this.acceptBlock("elseif condition"), null, false])
+				);
+			} else if(this.acceptRoamingToken("keyword", "else")) {
+				args.push(
+					this.instruction(this.getTokenTrace(), "if", [null, this.acceptBlock("else"), null, true])
+				);
+				break;
+			} else {
+				break;
+			}
+		}
 
-		return this.acceptIfElse();
+		return args;
 	}
 
 	function acceptIfElse() {
 		if (this.acceptRoamingToken("keyword", "else"))
 			return this.acceptBlock("else");
 
+		trace("root?");
 		return this.instruction( this.getTokenTrace(), "root", [] );
 	}
 
@@ -523,7 +537,7 @@ class Parser {
 	function stmt1() {
 		if (this.acceptRoamingToken("keyword", "if")) {
 			var trace = this.getTokenTrace();
-			return this.instruction( trace, "if", [this.acceptCondition(), this.acceptBlock("if condition"), false, this.acceptIfElseIf()] );
+			return this.instruction( trace, "if", [this.acceptCondition(), this.acceptBlock("if condition"), this.acceptIfElseIf(), false] );
 		}
 		return this.stmt2();
 	}
@@ -1136,7 +1150,7 @@ class Parser {
 
 					expr = this.instruction( trace, "stringcall", [expr, exprs, stype] );
 				} else {
-					expr = this.instruction( trace, "stringcall", [expr, exprs, ""] );
+					expr = this.instruction( trace, "stringcall", [expr, exprs, null] );
 				}
 			} else {
 				break;

src/Base/Transpiler/Lua.hx

@@ -41,31 +41,25 @@ class Instructions {
 	static function instr_literal(value: E2Type, raw: String)
 		return raw;
 
-	static function instr_if(cond: Instruction, block: Instruction, is_elseif: Bool, ifeif: Instruction) {
-		if (is_elseif) {
-			return 'is_elseif';
-		}
-
-		if( ifeif == null ) {
-			return 'ifeif is null; $block $cond';
-		}
-
-		if ( block == null ) {
-			return 'block is null';
+	static function instr_if(cond: Instruction, block: Instruction, ifeifs: Array<Instruction>, is_else: Bool) {
+
+		if (ifeifs != null) {
+			// Top If
+			var code = 'if ${ callInline(cond) } then\n' +
+						'\t${ callBlock(block, true) }\n';
+			for (ifeif in ifeifs) {
+				code += callInline(ifeif);
+			}
+			return code + 'end';
+		} else {
+			if (is_else) {
+				return 'else\n' +
+					'\t${ callBlock(block,true) }\n';
+			} else {
+				return 'elseif ${ callInline(cond) } then\n' +
+					'\t${ callBlock(block,true) }\n';
+			}
 		}
-
-		return 'if ${ callInline(cond) } then\n' +
-			'\t${ callBlock(block, true) }\n' +
-		'end';
-
-		/*return 'if ${ callInline(cond) } then\n' +
-			'\t$block\n' +
-			'\t${ callBlock(ifeif, true) }\n' +
-		(is_elseif ? '<iselseif>' : 'end');*/
-
-		/*return build +
-			'\t${ callBlock(block, true) }\n' +
-		'end [${ ifeif != null ? callBlock(ifeif, false) : "" }]';*/
 	}
 
 	static function instr_for(varname: String, start: Instruction, end: Instruction, ?inc: Instruction, block: Instruction) {
@@ -191,6 +185,10 @@ class Instructions {
 		'end)';
 	}
 
+	static function instr_stringcall(name:Instruction, args: Array<Instruction>, ret_type: Null<String>) {
+		return '_G[${ callInline(name) }](${ args.map( (x) -> callInline(x) ).join(", ") })';
+	}
+
 	// Bitwise ops
 	static function instr_bor(v1: Instruction, v2: Instruction) {
 		#if LUA54