Fix up single statement "blocks".

3 files changed, 13 insertions, 5 deletions

diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/src/LuaSL_LSL_tree.h
index 931b6b9..5e36c73 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, and two semicolons, everything else has zero or one.
     LSL_Block           *block;
+    LSL_Statement       *single;        // For single statement "blocks".
     LSL_Statement       *elseBlock;
     LSL_Type            type;           // Expression type.
 #if LUASL_DIFF_CHECK
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index 236b2a6..0b56845 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -776,7 +776,12 @@ LSL_Leaf *addStatement(LuaSL_compiler *compiler, LSL_Leaf *lval, LSL_Leaf *flow,
         stat->type = flow->toKen->type;
         stat->expressions = expr;
         if (block)
-            stat->block = block->value.blockValue;
+        {
+            if (LSL_BLOCK_OPEN == block->toKen->type)
+                stat->block = block->value.blockValue;
+            else
+                stat->single = block->value.statementValue;
+        }
         eina_clist_element_init(&(stat->statement));
         if (identifier)
             stat->identifier = identifier->value.identifierValue;
@@ -1575,6 +1580,8 @@ static void outputRawStatement(FILE *file, outputMode mode, LSL_Statement *state
 
         if (statement->block)
             outputRawBlock(file, mode, statement->block);
+        if (statement->single)
+            outputRawStatement(file, mode, statement->single);
 
 #if LUASL_DIFF_CHECK
         if ((statement->ignorable) && (statement->ignorable[0]))
diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y
index b45c7d2..ad85337 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/src/LuaSL_lemon_yaccer.y
@@ -69,14 +69,14 @@ statementList(A) ::= .								{ A = collectStatements(compiler, NULL, NULL); }
 %nonassoc LSL_ELSE.
 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, S,    F, L, E0, S0, E1, S1, E2, R, NULL); }
+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) 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); }
+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); }
 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); }
+elseBlock(A) ::= LSL_ELSE(F) statement(S).                                                                                                              { A = addStatement(compiler, NULL, F, NULL, NULL, NULL, S,    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); }
@@ -84,7 +84,7 @@ statement(A) ::= LSL_RETURN(F) LSL_STATEMENT(S).													{ A = addStatement(
 statement(A) ::= LSL_STATE_CHANGE(F) LSL_DEFAULT(I) LSL_STATEMENT(S).                                                                                   { A = addStatement(compiler, S,    F, NULL, NULL, NULL, NULL, I); }
 statement(A) ::= LSL_STATE_CHANGE(F) LSL_IDENTIFIER(I) LSL_STATEMENT(S).                                                                                { A = addStatement(compiler, S,    F, NULL, NULL, NULL, NULL, I); }
 statement(A) ::= LSL_WHILE(F) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) block(B).                                                        { A = addStatement(compiler, NULL, F, L,    E,    R,    B,    NULL); }
-statement(A) ::= LSL_WHILE(F) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) statement(S).                                                    { A = addStatement(compiler, S,    F, L,    E,    R,    NULL, NULL); }
+statement(A) ::= LSL_WHILE(F) LSL_PARENTHESIS_OPEN(L) expr(E) LSL_PARENTHESIS_CLOSE(R) statement(S).                                                    { A = addStatement(compiler, NULL, F, L,    E,    R,    S,    NULL); }
 
 %nonassoc LSL_LABEL.
 statement(A) ::= LSL_LABEL(F) LSL_IDENTIFIER(I) LSL_STATEMENT(S).                                                                                       { A = addStatement(compiler, S,    F, NULL, NULL, NULL, NULL, I); }