3 files changed, 10 insertions, 34 deletions

diff --git a/src/LuaSL/LuaSL_LSL_tree.h b/src/LuaSL/LuaSL_LSL_tree.h
index e7c5e36..514443a 100644
--- a/src/LuaSL/LuaSL_LSL_tree.h
+++ b/src/LuaSL/LuaSL_LSL_tree.h
@@ -3,8 +3,6 @@
 #define __LUASL_TREE_H__
 
 #define LUASL_DEBUG             0
-#define COMPILE_THREADED        1
-#define COMPILE_OUTPUT          0
 #define LUASL_DIFF_CHECK        0
 #define LUASL_BAD_CHECK         0
 
@@ -408,8 +406,6 @@ typedef struct
 #endif
 
 
-void finishMessage(LuaCompile *compiler, compileMessage *message, int type, int column, int line);
-
 boolean compilerSetup(gameGlobals *ourGlobals);
 void compileLSL(LuaCompiler *compiler);
 void burnLeaf(void *data);
diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index 13ebe1e..2b838e3 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -220,15 +220,6 @@ LSL_Script constants;
 int lowestToken = 999999;
 
 
-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));
@@ -596,7 +587,7 @@ else if (right)
     printf("NOLEFT %s %s\n", lval->toKen->toKen, right->toKen->toKen);
 else
     printf("NOLEFT %s NORIGHT\n", lval->toKen->toKen);
-                printf("############################################################################## left\n");
+                printf("############################################################################## left - column %i,  line %i  %s\n", lval->column, lval->line, compiler->compiler->file);
 #endif
                 left->flags |= MF_WRAPFUNC;
                 if (LSL_PARENTHESIS_OPEN == left->toKen->type)
@@ -2222,7 +2213,7 @@ boolean compilerSetup(gameGlobals *ourGlobals)
     if (tokens)
     {
         char buf[PATH_MAX];
-        LuaCompiler *compiler = calloc(1, sizeof(LuaCompiler));
+        LuaCompiler *compiler;
 
         // Sort the token table.
         for (i = 0; LSL_Tokens[i].toKen != NULL; i++)
@@ -2236,10 +2227,8 @@ boolean compilerSetup(gameGlobals *ourGlobals)
         snprintf(buf, sizeof(buf), "luajit -e 'require(\"LSL\").gimmeLSL()' > %s/constants.lsl", prefix_lib_get());
         system(buf);
         snprintf(buf, sizeof(buf), "%s/constants.lsl", prefix_lib_get());
-        compiler->file = strdup(buf);
-        compiler->SID = strdup("FAKE_SID");
+        compiler = createCompiler("FAKE_SID", buf, (compileCb) compileLSL, NULL);
         compiler->doConstants = TRUE;
-        compiler->parser = (compileCb) compileLSL;
         compileScript(compiler, FALSE);
 
         return TRUE;
diff --git a/src/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c
index 664cdd1..b72a155 100644
--- a/src/LuaSL/LuaSL_main.c
+++ b/src/LuaSL/LuaSL_main.c
@@ -228,7 +228,7 @@ static Eina_Bool parser(void *data, Connection *connection, char *SID, char *com
     {
         char *temp;
         char *file;
-        LuaCompiler *compiler = calloc(1, sizeof(LuaCompiler));
+        LuaCompiler *compiler;
 
         strcpy(buf, &command[8]);
         temp = buf;
@@ -237,15 +237,10 @@ static Eina_Bool parser(void *data, Connection *connection, char *SID, char *com
             temp++;
         temp[0] = '\0';
 
-        eina_clist_init(&(compiler->messages));
-        compiler->file = strdup(file);
-        compiler->SID = strdup(SID);
+        compiler = createCompiler(SID, file, (compileCb) compileLSL, _compileCb);
         compiler->client = connection;
-        compiler->doConstants = FALSE;
-        compiler->parser = (compileCb) compileLSL;
-        compiler->cb = _compileCb;
-PD("Compiling script %s", file);
-        compileScript(compiler, COMPILE_THREADED);
+        PI("Compiling script %s", file);
+        compileScript(compiler, TRUE);
     }
     else if (0 == strncmp(command, "run(", 4))
     {
@@ -266,7 +261,7 @@ PD("Compiling script %s", file);
         me = getScript(SID);
         if (me)
         {
-PD("Running script %s", me->fileName);
+            PI("Running script %s", me->fileName);
             runScript(me);
             releaseScript(me);
         }
@@ -311,13 +306,9 @@ int main(int argc, char **argv)
         // get the arguments passed in
         while (--argc > 0 && *++argv != '\0')
         {
-          LuaCompiler *compiler = calloc(1, sizeof(LuaCompiler));
+          LuaCompiler *compiler;
 
-          eina_clist_init(&(compiler->messages));
-          compiler->file = strdup(*argv);
-          compiler->SID = strdup("0");
-          compiler->doConstants = FALSE;
-          compiler->parser = (compileCb) compileLSL;
+          compiler = createCompiler("0", *argv, (compileCb) compileLSL, _compileCbSingle);
           compiler->cb = _compileCbSingle;
           compileScript(compiler, FALSE);
         }