Finish separating out love.

5 files changed, 24 insertions, 113 deletions

diff --git a/src/LuaSL/LuaSL.h b/src/LuaSL/LuaSL.h
index d1f448e..175cebf 100644
--- a/src/LuaSL/LuaSL.h
+++ b/src/LuaSL/LuaSL.h
@@ -8,9 +8,7 @@
 #include <Eet.h>
 #include <Ecore.h>
 #include <Ecore_Con.h>
-#include <Ecore_Evas.h>
 #include <Ecore_File.h>
-#include <Edje.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -26,26 +24,12 @@ typedef struct _gameGlobals gameGlobals;	// Define this here, so LuaSL_threads.h
 #include "LumbrJack.h"
 
 
-#define WIDTH  (512)
-#define HEIGHT (384)
-
-
-#define TABLE_WIDTH     7
-#define TABLE_HEIGHT    42
-
-
 struct _gameGlobals
 {
-    Ecore_Evas          *ee;            // Our window.
-    Evas                *canvas;        // The canvas for drawing directly onto.
-    Evas_Object         *bg;            // Our background edje, also the game specific stuff.
-    Evas_Object         *edje;          // The edje of the background.
     Ecore_Con_Server    *server;
     Eina_Hash           *scripts, *names;
-    int                 logDom;
     const char          *address;
     int                 port;
-    boolean             ui;             // Wether we actually start up the UI.
 };
 
 struct _script
@@ -56,9 +40,7 @@ struct _script
     char                fileName[PATH_MAX];
     lua_State           *L;
     struct timeval      startTime;
-    float               compileTime, timerTime;
-    int                 bugs, warnings;
-    boolean             running;
+    float               timerTime;
     int                 status;
     int                 args;
     Eina_Clist          messages;
@@ -75,8 +57,5 @@ typedef struct
 
 
 void scriptSendBack(void * data);
-void sendBack(gameGlobals *ourGlobals, Ecore_Con_Client *client, const char *SID, const char *message, ...);
-void sendForth(gameGlobals *ourGlobals, const char *SID, const char *message, ...);
-float timeDiff(struct timeval *now, struct timeval *then);
 
 #include "LuaSL_LSL_tree.h"
diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index 3265acf..0c398b9 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -1,5 +1,6 @@
 
 #include "LuaSL.h"
+#include "Runnr.h"
 
 /* TODO - problem de jour
 */
@@ -316,7 +317,6 @@ static LSL_Leaf *findVariable(LuaSL_compiler *compiler, const char *name)
 
 LSL_Leaf *checkVariable(LuaSL_compiler *compiler, LSL_Leaf *identifier, LSL_Leaf *dot, LSL_Leaf *sub)
 {
-    gameGlobals *ourGlobals = compiler->game;
     const char *search;
 
     if (dot)
@@ -358,7 +358,7 @@ LSL_Leaf *checkVariable(LuaSL_compiler *compiler, LSL_Leaf *identifier, LSL_Leaf
         else
         {
             compiler->script.bugCount++;
-            sendBack(ourGlobals, compiler->client, compiler->SID, "compilerError(%d,%d,NOT found %s)", identifier->line, identifier->column, identifier->value.stringValue);
+            sendBack(compiler->client, compiler->SID, "compilerError(%d,%d,NOT found %s)", identifier->line, identifier->column, identifier->value.stringValue);
         }
     }
 
@@ -367,8 +367,6 @@ LSL_Leaf *checkVariable(LuaSL_compiler *compiler, LSL_Leaf *identifier, LSL_Leaf
 
 LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval, LSL_Leaf *right)
 {
-    gameGlobals *ourGlobals = compiler->game;
-
     if (lval)
     {
         opType lType, rType;
@@ -402,7 +400,7 @@ LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval,
             if (OT_undeclared == lType)
             {
                 compiler->script.warningCount++;
-                sendBack(ourGlobals, compiler->client, compiler->SID, "compilerWarning(%d,%d,Undeclared identifier issue, deferring this until the second pass)", lval->line, lval->column);
+                sendBack(compiler->client, compiler->SID, "compilerWarning(%d,%d,Undeclared identifier issue, deferring this until the second pass)", lval->line, lval->column);
                 lval->basicType = OT_undeclared;
                 return lval;
             }
@@ -430,7 +428,7 @@ LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval,
             if (OT_undeclared == rType)
             {
                 compiler->script.warningCount++;
-                sendBack(ourGlobals, compiler->client, compiler->SID, "compilerWarning(%d,%d,Undeclared identifier issue, deferring this until the second pass)", lval->line, lval->column);
+                sendBack(compiler->client, compiler->SID, "compilerWarning(%d,%d,Undeclared identifier issue, deferring this until the second pass)", lval->line, lval->column);
                 lval->basicType = OT_undeclared;
                 return lval;
             }
@@ -587,7 +585,7 @@ else
             }
 
             compiler->script.bugCount++;
-            sendBack(ourGlobals, compiler->client, compiler->SID, "compilerError(%d,%d,Invalid operation [%s(%s) %s %s(%s)])", lval->line, lval->column, leftType, leftToken, lval->toKen->toKen, rightType, rightToken);
+            sendBack(compiler->client, compiler->SID, "compilerError(%d,%d,Invalid operation [%s(%s) %s %s(%s)])", lval->line, lval->column, leftType, leftToken, lval->toKen->toKen, rightType, rightToken);
         }
     }
 
@@ -991,7 +989,6 @@ LSL_Leaf *addFor(LuaSL_compiler *compiler, LSL_Leaf *lval, LSL_Leaf *flow, LSL_L
 
 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 *ourGlobals = compiler->game;
     LSL_Statement *stat = calloc(1, sizeof(LSL_Statement));
     boolean justOne = FALSE;
 
@@ -2220,7 +2217,7 @@ boolean compileLSL(gameGlobals *ourGlobals, Ecore_Con_Client *client, char *SID,
                     call->call->basicType = func->basicType;
                 }
                 else
-                    sendBack(ourGlobals, compiler.client, compiler.SID, "compilerError(%d,%d,Undeclared function %s called)", call->call->line, call->call->column, call->call->value.stringValue);
+                    sendBack(compiler.client, compiler.SID, "compilerError(%d,%d,Undeclared function %s called)", call->call->line, call->call->column, call->call->value.stringValue);
             }
         }
         secondPass(&compiler, compiler.ast);
diff --git a/src/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c
index f4c94ac..0d8a6db 100644
--- a/src/LuaSL/LuaSL_main.c
+++ b/src/LuaSL/LuaSL_main.c
@@ -1,5 +1,6 @@
 
 #include "LuaSL.h"
+#include "Runnr.h"
 
 
 int logDom;     // Our logging domain.
@@ -110,7 +111,7 @@ void scriptSendBack(void * data)
     else if (0 == strncmp(message->message, "llResetScript(", 14))
         resetScript(message->script);
     else
-        sendBack(ourGlobals, message->script->client, message->script->SID, message->message);
+        sendBack(message->script->client, message->script->SID, message->message);
     free(message);
 }
 
@@ -166,10 +167,10 @@ static Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Con_Event_Client_D
                     me->client = ev->client;
                     eina_hash_add(ourGlobals->scripts, me->SID, me);
                     eina_hash_add(ourGlobals->names, me->fileName, me);
-                    sendBack(ourGlobals, ev->client, SID, "compiled(true)");
+                    sendBack(ev->client, SID, "compiled(true)");
                 }
                 else
-                    sendBack(ourGlobals, ev->client, SID, "compiled(false)");
+                    sendBack(ev->client, SID, "compiled(false)");
             }
             else if (0 == strcmp(command, "run()"))
             {
@@ -238,6 +239,8 @@ int main(int argc, char **argv)
             {
                 if ((ourGlobals.server = ecore_con_server_add(ECORE_CON_REMOTE_TCP, ourGlobals.address, ourGlobals.port, &ourGlobals)))
                 {
+                    int i;
+
                     ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD,  (Ecore_Event_Handler_Cb) _add,  &ourGlobals);
                     ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA, (Ecore_Event_Handler_Cb) _data, &ourGlobals);
                     ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DEL,  (Ecore_Event_Handler_Cb) _del,  &ourGlobals);
@@ -247,26 +250,18 @@ int main(int argc, char **argv)
                     ecore_con_server_client_limit_set(ourGlobals.server, 3, 0);
                     clientStream = eina_strbuf_new();
 
-                    if (edje_init())
+                    result = 0;
+                    compilerSetup(&ourGlobals);
+                    luaprocInit();
+                    for (i = 0; i < CPUs; i++)
                     {
-                        int i;
-
-                        result = 0;
-                        compilerSetup(&ourGlobals);
-                        luaprocInit();
-                        for (i = 0; i < CPUs; i++)
-                        {
-                            if ( sched_create_worker( ) != LUAPROC_SCHED_OK )
-                                PE("Error creating luaproc worker thread.");
-                        }
-                        ecore_main_loop_begin();
-
-                        // TODO - this is what hangs the system, should change from raw pthreads to ecore threads.
-                        sched_join_workerthreads();
-                        edje_shutdown();
+                        if ( sched_create_worker( ) != LUAPROC_SCHED_OK )
+                        PE("Error creating luaproc worker thread.");
                     }
-                    else
-                        PC("Failed to init edje!");
+                    ecore_main_loop_begin();
+
+                    // TODO - this is what hangs the system, should change from raw pthreads to ecore threads.
+                    sched_join_workerthreads();
                 }
                 else
                     PC("Failed to add server!");
diff --git a/src/LuaSL/LuaSL_utilities.c b/src/LuaSL/LuaSL_utilities.c
deleted file mode 100644
index 40263df..0000000
--- a/src/LuaSL/LuaSL_utilities.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "LuaSL.h"
-
-
-void sendBack(gameGlobals *ourGlobals, Ecore_Con_Client *client, const char *SID, const char *message, ...)
-{
-    va_list args;
-    char buf[PATH_MAX];
-    int length = strlen(SID);
-
-    strncpy(buf, SID, length);
-    buf[length++] = '.';
-    va_start(args, message);
-    length += vsprintf(&buf[length], message, args);
-    va_end(args);
-    buf[length++] = '\n';
-    buf[length++] = '\0';
-    ecore_con_client_send(client, buf, strlen(buf));
-    ecore_con_client_flush(client);
-}
-
-void sendForth(gameGlobals *ourGlobals, const char *SID, const char *message, ...)
-{
-    va_list args;
-    char buf[PATH_MAX];
-    int length = strlen(SID);
-
-    strncpy(buf, SID, length);
-    buf[length++] = '.';
-    va_start(args, message);
-    length += vsprintf(&buf[length], message, args);
-    va_end(args);
-    buf[length++] = '\n';
-    buf[length++] = '\0';
-    ecore_con_server_send(ourGlobals->server, buf, strlen(buf));
-    ecore_con_server_flush(ourGlobals->server);
-}
-
-float timeDiff(struct timeval *now, struct timeval *then)
-{
-    if (0 == gettimeofday(now, 0))
-    {
-        struct timeval thisTime = { 0, 0 };
-        double  result = 0.0;
-
-        thisTime.tv_sec = now->tv_sec;
-        thisTime.tv_usec = now->tv_usec;
-        if (thisTime.tv_usec < then->tv_usec)
-        {
-            thisTime.tv_sec--;
-            thisTime.tv_usec += 1000000;
-        }
-        thisTime.tv_usec -= then->tv_usec;
-        thisTime.tv_sec -= then->tv_sec;
-        result = ((double) thisTime.tv_usec) / ((double) 1000000.0);
-        result += thisTime.tv_sec;
-        return result;
-    }
-    else
-        return 0.0;
-}
diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua
index 0efcca3..084a39c 100755
--- a/src/LuaSL/build.lua
+++ b/src/LuaSL/build.lua
@@ -26,4 +26,4 @@ CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"'    .. lib_d    .. '\\"'
 CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"'   .. data_d   .. '\\"'
 CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"'
 
-compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '')
+compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '')