Deal with parsing if ... else ...

3 files changed, 16 insertions, 3 deletions

diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/src/LuaSL_LSL_tree.h
index 87d1af0..b5dff7a 100644
--- a/LuaSL/src/LuaSL_LSL_tree.h
+++ b/LuaSL/src/LuaSL_LSL_tree.h
@@ -221,6 +221,7 @@ struct _LSL_Statement
     LSL_Parenthesis     *parenthesis;
     LSL_Leaf            *expressions;   // A for statement will have three expressions, everything else has zero or one.
     LSL_Block           *block;
+    LSL_Statement       *elseBlock;
     LSL_Type            type;           // Expression type.
 #if LUASL_DIFF_CHECK
     Eina_Strbuf         **ignorable;    // Can be up to five of these I think.
@@ -397,6 +398,7 @@ LSL_Leaf *addCrement(LuaSL_compiler *compiler, LSL_Leaf *variable, LSL_Leaf *cre
 LSL_Leaf *addFunction(LuaSL_compiler *compiler, LSL_Leaf *type, LSL_Leaf *identifier, LSL_Leaf *open, LSL_Leaf *params, LSL_Leaf *close);
 LSL_Leaf *addFunctionBody(LuaSL_compiler *compiler, LSL_Leaf *function, LSL_Leaf *block);
 LSL_Leaf *addFunctionCall(LuaSL_compiler *compiler, LSL_Leaf *identifier, LSL_Leaf *open, LSL_Leaf *params, LSL_Leaf *close);
+LSL_Leaf *addIfElse(LuaSL_compiler *compiler, LSL_Leaf *ifBlock, LSL_Leaf *elseBlock);
 LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval, LSL_Leaf *right);
 LSL_Leaf *addParameter(LuaSL_compiler *compiler, LSL_Leaf *type, LSL_Leaf *newParam);
 LSL_Leaf *addParenthesis(LSL_Leaf *lval, LSL_Leaf *expr, LSL_Type type, LSL_Leaf *rval);
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index 9c86f97..eada67f 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -727,6 +727,12 @@ LSL_Leaf *addState(LuaSL_compiler *compiler, LSL_Leaf *state, LSL_Leaf *identifi
     return identifier;
 }
 
+LSL_Leaf *addIfElse(LuaSL_compiler *compiler, LSL_Leaf *ifBlock, LSL_Leaf *elseBlock)
+{
+    ifBlock->value.statementValue->elseBlock = elseBlock->value.statementValue;
+    return ifBlock;
+}
+
 LSL_Leaf *addStatement(LuaSL_compiler *compiler, LSL_Leaf *lval, LSL_Leaf *flow, LSL_Leaf *left, LSL_Leaf *expr, LSL_Leaf *right, LSL_Leaf *block, LSL_Leaf *identifier)
 {
     gameGlobals *game = compiler->game;
@@ -1427,6 +1433,7 @@ static void outputRawStatement(FILE *file, outputMode mode, LSL_Statement *state
             }
             case LSL_ELSE :
             {
+                isBlock = TRUE;
 #if LUASL_DIFF_CHECK
             if ((statement->ignorable) && (statement->ignorable[1]))
                 fwrite(eina_strbuf_string_get(statement->ignorable[1]), 1, eina_strbuf_length_get(statement->ignorable[1]), file);
@@ -1509,6 +1516,9 @@ static void outputRawStatement(FILE *file, outputMode mode, LSL_Statement *state
             if (!LUASL_DIFF_CHECK)
                 fprintf(file, "\n");
         }
+
+        if (statement->elseBlock)
+            outputRawStatement(file, mode, statement->elseBlock);
     }
 }
 
diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y
index 828cf12..72d328c 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/src/LuaSL_lemon_yaccer.y
@@ -71,11 +71,12 @@ statement(A) ::= LSL_DO(F) block(B) LSL_WHILE(W) LSL_PARENTHESIS_OPEN(L) expr(E)
 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 = addStatement(compiler, NULL, F, L,    E1,   R, B,    NULL); }     // three expressions, two semi colons
 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 = addStatement(compiler, S, F, L, E1, R, NULL, NULL); }     // three expressions, two semi colons
 
-statement(A) ::= ifBlock(B).                                                            { A = B; }
-ifBlock ::= ifBlock LSL_ELSE block.
-ifBlock ::= ifBlock LSL_ELSE statement.
+statement(A) ::= ifBlock(B).                                                                                                                            { A = B; }
+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, S,    F, L,    E,    R,    NULL, 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, S,    F, NULL, NULL, NULL, NULL, NULL); }
 
 statement(A) ::= LSL_JUMP(F) LSL_IDENTIFIER(I) LSL_STATEMENT(S).                                                                                        { A = addStatement(compiler, S,    F, NULL, NULL, NULL, NULL, I); }
 statement(A) ::= LSL_RETURN(F) expr(E) LSL_STATEMENT(S).                                                                                                { A = addStatement(compiler, S,    F, NULL, E,    NULL, NULL, NULL); }