Some more list adding and concatenation fixes.

2 files changed, 11 insertions, 2 deletions

diff --git a/lib/LSL.lua b/lib/LSL.lua
index d61457b..ad56a37 100644
--- a/lib/LSL.lua
+++ b/lib/LSL.lua
@@ -984,6 +984,10 @@ function LSL.listAddList(a, b)
   local i = 1
   local result = {}
 
+  -- Deal with implicit typecasts.
+  if 'list' ~= type(a) then a = {a} end
+  if 'list' ~= type(b) then b = {b} end
+
   for j, v in ipairs(a) do
     i = i + 1
     table.insert(result, i, v)
diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index e31e157..492f234 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -478,7 +478,6 @@ LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval,
                                 break;
 
                             case ST_ADD :
-                                // TODO - This doesn't work if the right side has been cast to a list.
                                 if (OT_listList == lval->basicType)
                                 {
                                     lval->basicType = OT_list;
@@ -492,7 +491,13 @@ LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval,
                                 break;
 
                             case ST_CONCATENATION :
-                                if ((OT_list == lType) && (OT_list != rType))
+                                // TODO - This doesn't work if the right side has been cast to a list.
+                                if (OT_listList == lval->basicType)
+                                {
+                                    lval->basicType = OT_list;
+                                    lval->toKen = tokens[LSL_LIST_ADD_LIST - lowestToken];
+                                }
+                                else if ((OT_list == lType) && (OT_list != rType))
                                 {
                                     lval->basicType = OT_list;
                                     lval->toKen = tokens[LSL_LIST_CONCAT - lowestToken];