2 files changed, 24 insertions, 22 deletions

diff --git a/lib/LSL.lua b/lib/LSL.lua
index 4ec64b5..e783087 100644
--- a/lib/LSL.lua
+++ b/lib/LSL.lua
@@ -986,7 +986,7 @@ end
 
 -- Misc support functions.
 
-function LSL.listAddList(a, b)
+function LSL.listAdd(a, b)
   local i = 1
   local result = {}
 
@@ -1007,20 +1007,6 @@ function LSL.listAddList(a, b)
   return result;
 end
 
-function LSL.listAdd(a, b)
-  local i = 1
-  local result = {}
-
-  for j, v in ipairs(a) do
-    i = i + 1
-    table.insert(result, i, v)
-  end
-
-  table.insert(result, i, b)
-
-  return result;
-end
-
 function LSL.listConcat(a, b)
   local i = table.maxn(a)
   local result = a
diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index fb9a5be..c1b119e 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -478,25 +478,41 @@ LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval,
                                 break;
 
                             case ST_ADD :
+                                // someList = (list) notAList + someList        -> someList = _LSL.listAddList( _LSL.listTypecast(notAList), someList)
+                                // someList = aList + bList                     -> someList = _LSL.listAddList(aList, bList)
                                 if (OT_listList == lval->basicType)
                                 {
                                     lval->basicType = OT_list;
                                     lval->toKen = tokens[LSL_LIST_ADD_LIST - lowestToken];
                                 }
-                                else if (OT_list == lType)
+                                // This one is not turning up in my test code, so not tested.
+                                // someList = notAList + someList               -> someList = _LSL.listAddList( notAList, someList)
+                                // someList = someList + notAList               -> someList = _LSL.listAddList( someList, notAList)
+                                else if ((OT_list == lType) || (OT_list == rType))
                                 {
+
+if ((left) && (right))
+    printf("LA LINE %d - %s %s %s\n", lval->line, left->toKen->toKen, lval->toKen->toKen, right->toKen->toKen);
+else if (left)
+    printf("LA LINE %d - %s %s NORIGHT\n", lval->line, left->toKen->toKen, lval->toKen->toKen);
+else if (right)
+    printf("LA LINE %d - NOLEFT %s %s\n", lval->line, lval->toKen->toKen, right->toKen->toKen);
+else
+    printf("LA LINE %d - NOLEFT %s NORIGHT\n", lval->line, lval->toKen->toKen);
+
                                     lval->basicType = OT_list;
-                                    lval->toKen = tokens[LSL_LIST_ADD - lowestToken];
+                                    lval->toKen = tokens[LSL_LIST_ADD_LIST - lowestToken];
                                 }
                                 break;
 
                             case ST_CONCATENATION :
-                                // This is if the right side has been cast to a list.
+                                // someList += (list) notAList                  -> someList = _LSL.listAddList(someList, _LSL.listTypecast(notAList))
                                 if ((LSL_ASSIGNMENT_PLAIN != lval->toKen->type) && (OT_listList == lval->basicType))
                                 {
                                     lval->basicType = OT_list;
-                                    lval->toKen = tokens[LSL_LIST_ADD_LIST - lowestToken];
+                                    lval->toKen = tokens[LSL_LIST_ADD - lowestToken];
                                 }
+                                // someList += notAList                         -> someList = _LSL.listConcat(someList, notAList)
                                 else if ((OT_list == lType) && (OT_list != rType))
                                 {
                                     lval->basicType = OT_list;
@@ -1382,7 +1398,7 @@ static void outputLeaf(FILE *file, outputMode mode, LSL_Leaf *leaf)
 {
     if (leaf)
     {
-        if ((OM_LUA == mode) && (ST_BITWISE != leaf->toKen->subType) && (LSL_LIST_ADD != leaf->toKen->type) && (LSL_LIST_ADD_LIST != leaf->toKen->type))
+        if ((OM_LUA == mode) && (ST_BITWISE != leaf->toKen->subType) /*&& (LSL_LIST_ADD != leaf->toKen->type)*/ && (LSL_LIST_ADD_LIST != leaf->toKen->type))
             outputLeaf(file, mode, leaf->left);
 #if LUASL_DIFF_CHECK
         if ((!(LSL_NOIGNORE & leaf->toKen->flags)) && (leaf->ignorable))
@@ -1439,7 +1455,7 @@ else
                     fprintf(file, " ~= ");
                 else if (LSL_LIST_ADD == leaf->toKen->type)
                 {
-                    fprintf(file, " _LSL.listAdd(");
+                    fprintf(file, " = _LSL.listAdd(");
                     outputLeaf(file, mode, leaf->left);
                     fprintf(file, ", ");
                     outputLeaf(file, mode, leaf->right);
@@ -1447,7 +1463,7 @@ else
                 }
                 else if (LSL_LIST_ADD_LIST == leaf->toKen->type)
                 {
-                    fprintf(file, " _LSL.listAddList(");
+                    fprintf(file, " _LSL.listAdd(");
                     outputLeaf(file, mode, leaf->left);
                     fprintf(file, ", ");
                     outputLeaf(file, mode, leaf->right);