2 files changed, 40 insertions, 6 deletions

diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index d1ef48b..b2ae841 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -223,6 +223,15 @@ LSL_Script constants;
 int lowestToken = 999999;
 
 
+static void finishMessage(LuaCompile *compiler, compileMessage *message, int type, int column, int line)
+{
+    message->type   = type;
+    message->column = column;
+    message->line   = line;
+    if (type)
+        compiler->bugCount++;
+}
+
 static LSL_Leaf *newLeaf(LSL_Type type, LSL_Leaf *left, LSL_Leaf *right)
 {
     LSL_Leaf *leaf = calloc(1, sizeof(LSL_Leaf));
@@ -361,8 +370,11 @@ LSL_Leaf *checkVariable(LuaSL_compiler *compiler, LSL_Leaf *identifier, LSL_Leaf
         }
         else
         {
-            compiler->compiler->bugCount++;
-            sendBack(compiler->compiler->client, compiler->compiler->SID, "compilerError(%d,%d,NOT FOUND variable %s)", identifier->line, identifier->column, identifier->value.stringValue);
+//          compiler->compiler->bugCount++;
+//          sendBack(compiler->compiler->client, compiler->compiler->SID, "compilerError(%d,%d,NOT FOUND variable %s)", identifier->line, identifier->column, identifier->value.stringValue);
+            finishMessage(compiler->compiler, addMessage(&(compiler->compiler->messages), sizeof(compileMessage),
+                "NOT FOUND variable %s", identifier->value.stringValue),
+                1, identifier->column, identifier->line);
         }
     }
 
@@ -632,8 +644,11 @@ else
                 rightType = allowed[right->basicType].name;
             }
 
-            compiler->compiler->bugCount++;
-            sendBack(compiler->compiler->client, compiler->compiler->SID, "compilerError(%d,%d,Invalid operation [%s(%s) %s %s(%s)])", lval->line, lval->column, leftType, leftToken, lval->toKen->toKen, rightType, rightToken);
+//          compiler->compiler->bugCount++;
+//          sendBack(compiler->compiler->client, compiler->compiler->SID, "compilerError(%d,%d,Invalid operation [%s(%s) %s %s(%s)])", lval->line, lval->column, leftType, leftToken, lval->toKen->toKen, rightType, rightToken);
+            finishMessage(compiler->compiler, addMessage(&(compiler->compiler->messages), sizeof(compileMessage),
+                "Invalid operation [%s(%s) %s %s(%s)]", leftType, leftToken, lval->toKen->toKen, rightType, rightToken),
+                1, lval->column, lval->line);
         }
     }
 
@@ -2234,7 +2249,7 @@ void compileLSL(LuaCompiler *compiler)
     lcompiler->ignorable = eina_strbuf_new();
 #endif
 
-    PI("Compiling %s.", lcompiler->compiler->file);
+//    PI("Compiling %s.", lcompiler->compiler->file);
 
     in = fopen(lcompiler->compiler->file, "r");
     if (NULL == in)
@@ -2300,7 +2315,12 @@ void compileLSL(LuaCompiler *compiler)
                     call->call->basicType = func->basicType;
                 }
                 else
-                    sendBack(lcompiler->compiler->client, lcompiler->compiler->SID, "compilerError(%d,%d,NOT FOUND function %s called)", call->call->line, call->call->column, call->call->value.stringValue);
+                {
+//                  sendBack(lcompiler->compiler->client, lcompiler->compiler->SID, "compilerError(%d,%d,NOT FOUND function %s called)", call->call->line, call->call->column, call->call->value.stringValue);
+                    finishMessage(lcompiler->compiler, addMessage(&(lcompiler->compiler->messages), sizeof(compileMessage),
+                        "NOT FOUND function %s called)", call->call->value.stringValue),
+                        1, call->call->column, call->call->line);
+                }
             }
         }
         secondPass(lcompiler, lcompiler->ast);
diff --git a/src/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c
index f316fdb..1eaa43a 100644
--- a/src/LuaSL/LuaSL_main.c
+++ b/src/LuaSL/LuaSL_main.c
@@ -182,6 +182,18 @@ static Eina_Bool _add(void *data, int type __UNUSED__, Ecore_Con_Event_Client_Ad
 
 static void _compileCb(LuaCompiler *compiler)
 {
+  compileMessage *message = NULL, *safe = NULL;
+
+  EINA_CLIST_FOR_EACH_ENTRY_SAFE(message, safe, &(compiler->messages), compileMessage, node)
+  {
+    if (message->type)
+      sendBack(compiler->client, compiler->SID, "compilerError(%d,%d,%s)",   message->line, message->column, message->message);
+    else
+      sendBack(compiler->client, compiler->SID, "compilerWarning(%d,%d,%s)", message->line, message->column, message->message);
+    eina_clist_remove(&(message->node));
+    free(message);
+  }
+
   if (0 == compiler->bugCount)
     sendBack(compiler->client, compiler->SID, "compiled(true)");
   else
@@ -223,6 +235,7 @@ static Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Con_Event_Client_D
                     temp++;
                 temp[0] = '\0';
 
+                eina_clist_init(&(compiler->messages));
                 compiler->file = strdup(file);
                 compiler->SID = strdup(SID);
                 compiler->client = ev->client;
@@ -304,6 +317,7 @@ int main(int argc, char **argv)
         ourGlobals.names = eina_hash_string_superfast_new(NULL);
         if (ecore_init())
         {
+//          ecore_thread_max_set(4);
             if (ecore_con_init())
             {
                 if ((ourGlobals.server = ecore_con_server_add(ECORE_CON_REMOTE_TCP, ourGlobals.address, ourGlobals.port, &ourGlobals)))