aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2012-01-22 14:38:11 +1000
committerDavid Walter Seikel2012-01-22 14:38:11 +1000
commitab08cc4ffc2dd95c3dd4ff3cd0b931ac462bd2b6 (patch)
tree247aa83dab7042c49f2365b14f7b1dac41150571
parentCollect function definitions, add them to state blocks. (diff)
downloadSledjHamr-ab08cc4ffc2dd95c3dd4ff3cd0b931ac462bd2b6.zip
SledjHamr-ab08cc4ffc2dd95c3dd4ff3cd0b931ac462bd2b6.tar.gz
SledjHamr-ab08cc4ffc2dd95c3dd4ff3cd0b931ac462bd2b6.tar.bz2
SledjHamr-ab08cc4ffc2dd95c3dd4ff3cd0b931ac462bd2b6.tar.xz
Clean up the block, state, and statement output LSL.
-rw-r--r--LuaSL/src/LuaSL_compile.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index 0e1ae50..dbc2c17 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -1016,7 +1016,6 @@ static LSL_Leaf *eveluateParenthesisToken(LSL_Leaf *content, LSL_Leaf *left, LSL
1016 return result; 1016 return result;
1017} 1017}
1018 1018
1019
1020static LSL_Leaf *evaluateStatementToken(LSL_Leaf *content, LSL_Leaf *left, LSL_Leaf *right) 1019static LSL_Leaf *evaluateStatementToken(LSL_Leaf *content, LSL_Leaf *left, LSL_Leaf *right)
1021{ 1020{
1022 LSL_Leaf *result = NULL; 1021 LSL_Leaf *result = NULL;
@@ -1072,7 +1071,8 @@ static void outputBlockToken(FILE *file, outputMode mode, LSL_Leaf *content)
1072 EINA_CLIST_FOR_EACH_ENTRY(statement, &(content->value.blockValue->statements), LSL_Statement, statement) 1071 EINA_CLIST_FOR_EACH_ENTRY(statement, &(content->value.blockValue->statements), LSL_Statement, statement)
1073 { 1072 {
1074 outputLeaf(file, mode, statement->expressions); 1073 outputLeaf(file, mode, statement->expressions);
1075 fprintf(file, ";\n"); 1074 if (LSL_FUNCTION != statement->type)
1075 fprintf(file, ";\n");
1076 } 1076 }
1077 } 1077 }
1078 fprintf(file, "}\n"); 1078 fprintf(file, "}\n");
@@ -1173,9 +1173,9 @@ static void outputStateToken(FILE *file, outputMode mode, LSL_Leaf *content)
1173 if (state) 1173 if (state)
1174 { 1174 {
1175 if (0 == strcmp(state->name, "default")) 1175 if (0 == strcmp(state->name, "default"))
1176 fprintf(file, "%s\n", state->name); 1176 fprintf(file, "%s", state->name);
1177 else 1177 else
1178 fprintf(file, "state %s\n", state->name); 1178 fprintf(file, "state %s", state->name);
1179 outputLeaf(file, mode, state->block); 1179 outputLeaf(file, mode, state->block);
1180 fprintf(file, "\n"); 1180 fprintf(file, "\n");
1181 } 1181 }
@@ -1191,7 +1191,8 @@ static void outputStatementToken(FILE *file, outputMode mode, LSL_Leaf *content)
1191 if (content->ignorableText) 1191 if (content->ignorableText)
1192 fwrite(eina_strbuf_string_get(content->ignorableText), 1, eina_strbuf_length_get(content->ignorableText), file); 1192 fwrite(eina_strbuf_string_get(content->ignorableText), 1, eina_strbuf_length_get(content->ignorableText), file);
1193#endif 1193#endif
1194 fprintf(file, "%s", content->token->token); 1194 if (LSL_FUNCTION != content->value.statementValue->type)
1195 fprintf(file, "%s", content->token->token);
1195#ifndef LUASL_DIFF_CHECK 1196#ifndef LUASL_DIFF_CHECK
1196 fprintf(file, "\n"); 1197 fprintf(file, "\n");
1197#endif 1198#endif