LSL "else if" -> Lua "elseif", and it was a bitch. lol

1 files changed, 6 insertions, 3 deletions

diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y
index 9199699..716c65a 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/src/LuaSL_lemon_yaccer.y
@@ -66,15 +66,18 @@ statementList(A) ::= statementList(B) statement(C).														{ A = collectSt
 statementList(A) ::= .                                                                                                                                          { A = collectStatements(compiler, NULL, NULL); }
 
 %nonassoc LSL_DO LSL_FOR LSL_IF LSL_JUMP LSL_RETURN LSL_STATE_CHANGE LSL_WHILE.
-%nonassoc LSL_ELSE.
+%nonassoc LSL_ELSE LSL_ELSEIF.
 statement(A) ::= LSL_DO(F) block(B) LSL_WHILE(W) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) LSL_STATEMENT(S).                                     { A = addStatement(compiler, S,    F, L,    E,    R, B,    W); }
 statement(A) ::= LSL_FOR(F) LSL_PARENTHESIS_OPEN(L) expr(E0) LSL_STATEMENT(S0) expr(E1) LSL_STATEMENT(S1) expr(E2) LSL_PARENTHESIS_CLOSE(R) block(B).           { A = addFor(compiler, NULL, F, L, E0, S0, E1, S1, E2, R, B); }
 statement(A) ::= LSL_FOR(F) LSL_PARENTHESIS_OPEN(L) expr(E0) LSL_STATEMENT(S0) expr(E1) LSL_STATEMENT(S1) expr(E2) LSL_PARENTHESIS_CLOSE(R) statement(S).       { A = addFor(compiler, NULL, F, L, E0, S0, E1, S1, E2, R, S); }
 
 statement(A) ::= ifBlock(B).                                                                                                                                    { A = B; }
+ifBlock(A) ::= ifBlock(B) elseIfBlock(E).                                                                                                                       { A = addIfElse(compiler, B, E); }
 ifBlock(A) ::= ifBlock(B) elseBlock(E).                                                                                                                         { A = addIfElse(compiler, B, E); }
-ifBlock(A) ::= LSL_IF(F) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) block(B).     [LSL_ELSE]                                                      { A = addStatement(compiler, NULL, F, L,    E,    R,    B,    NULL); }
-ifBlock(A) ::= LSL_IF(F) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) statement(S). [LSL_ELSE]                                                      { A = addStatement(compiler, NULL, F, L,    E,    R,    S,    NULL); }
+ifBlock(A) ::= LSL_IF(F) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) block(B).             [LSL_ELSE]                                              { A = addStatement(compiler, NULL, F, L,    E,    R,    B,    NULL); }
+ifBlock(A) ::= LSL_IF(F) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) statement(S).         [LSL_ELSE]                                              { A = addStatement(compiler, NULL, F, L,    E,    R,    S,    NULL); }
+elseIfBlock(A) ::= LSL_ELSEIF(F) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) block(B).     [LSL_ELSEIF]                                            { A = addStatement(compiler, NULL, F, L,    E,    R,    B,    NULL); }
+elseIfBlock(A) ::= LSL_ELSEIF(F) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) statement(S). [LSL_ELSEIF]                                            { A = addStatement(compiler, NULL, F, L,    E,    R,    S,    NULL); }
 elseBlock(A) ::= LSL_ELSE(F) block(B).                                                                                                                          { A = addStatement(compiler, NULL, F, NULL, NULL, NULL, B,    NULL); }
 elseBlock(A) ::= LSL_ELSE(F) statement(S).                                                                                                                      { A = addStatement(compiler, NULL, F, NULL, NULL, NULL, S,    NULL); }