3 files changed, 96 insertions, 3 deletions

diff --git a/lib/LSL.lua b/lib/LSL.lua
index 695c05d..092c3d9 100644
--- a/lib/LSL.lua
+++ b/lib/LSL.lua
@@ -871,5 +871,46 @@ function LSL.gimmeLSL()
   end
 end
 
+-- Misc support functions.
+
+function LSL.listAddList(a, b)
+  local i = 1
+  local result = {}
+
+  for j, v in ipairs(a) do
+    i = i + 1
+    table.insert(result, i, v)
+  end
+
+  for j, v in ipairs(b) do
+    i = i + 1
+    table.insert(result, i, v)
+  end
+
+  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
+
+  table.insert(result, i + 1, b)
+
+  return result;
+end
 
 return LSL;
diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index bab94f3..f2fa37e 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -145,6 +145,10 @@ LSL_Token LSL_Tokens[] =
     {LSL_STATE,                 ST_NONE,        "state",        LSL_NONE,                               outputStateToken},
     {LSL_SCRIPT,                ST_NONE,        "",             LSL_NONE,                               NULL},
 
+    {LSL_LIST_CONCAT,           ST_CONCATENATION,"listconcat",  LSL_RIGHT2LEFT | LSL_ASSIGNMENT,        NULL},
+    {LSL_LIST_ADD,              ST_ADD,         "listadd",      LSL_LEFT2RIGHT,                         NULL},
+    {LSL_LIST_ADD_LIST,         ST_ADD,         "listaddlist",  LSL_LEFT2RIGHT,                         NULL},
+
     {LSL_UNKNOWN,               ST_NONE,        "unknown",      LSL_NONE,                               NULL},
 
     // A sentinal.
@@ -472,6 +476,28 @@ LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval,
                                         lval->basicType = OT_vector;
                                 }
                                 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;
+                                    lval->toKen = tokens[LSL_LIST_ADD_LIST - lowestToken];
+                                }
+                                else if (OT_list == lType)
+                                {
+                                    lval->basicType = OT_list;
+                                    lval->toKen = tokens[LSL_LIST_ADD - lowestToken];
+                                }
+                                break;
+
+                            case ST_CONCATENATION :
+                                if ((OT_list == lType) && (OT_list != rType))
+                                {
+                                    lval->basicType = OT_list;
+                                    lval->toKen = tokens[LSL_LIST_CONCAT - lowestToken];
+                                }
+                                break;
                             default :
                                 break;
                         }
@@ -1349,7 +1375,7 @@ static void outputLeaf(FILE *file, outputMode mode, LSL_Leaf *leaf)
 {
     if (leaf)
     {
-        if ((OM_LUA == mode) &&(ST_BITWISE != leaf->toKen->subType))
+        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))
@@ -1375,7 +1401,15 @@ else
                 }
                 if ((LSL_ASSIGNMENT & leaf->toKen->flags) && (LSL_ASSIGNMENT_PLAIN != leaf->toKen->type))
                 {
-                    if (leaf->left->value.identifierValue->sub)
+                    if (LSL_LIST_CONCAT == leaf->toKen->type)
+                    {
+                        fprintf(file, " = _LSL.listConcat(");
+                        outputLeaf(file, mode, leaf->left);
+                        fprintf(file, ", ");
+                        outputLeaf(file, mode, leaf->right);
+                        fprintf(file, ") ");
+                    }
+                    else if (leaf->left->value.identifierValue->sub)
                         fprintf(file, " --[[%s]] = %s.%s %.1s ", leaf->toKen->toKen, leaf->left->value.identifierValue->name.text, leaf->left->value.identifierValue->sub, leaf->toKen->toKen);
                     else
                         fprintf(file, " --[[%s]] = %s %.1s ", leaf->toKen->toKen, leaf->left->value.identifierValue->name.text, leaf->toKen->toKen);
@@ -1396,13 +1430,29 @@ else
                     fprintf(file, " .. ");
                 else if (LSL_NOT_EQUAL == leaf->toKen->type)
                     fprintf(file, " ~= ");
+                else if (LSL_LIST_ADD == leaf->toKen->type)
+                {
+                    fprintf(file, " _LSL.listAdd(");
+                    outputLeaf(file, mode, leaf->left);
+                    fprintf(file, ", ");
+                    outputLeaf(file, mode, leaf->right);
+                    fprintf(file, ") ");
+                }
+                else if (LSL_LIST_ADD_LIST == leaf->toKen->type)
+                {
+                    fprintf(file, " _LSL.listAddList(");
+                    outputLeaf(file, mode, leaf->left);
+                    fprintf(file, ", ");
+                    outputLeaf(file, mode, leaf->right);
+                    fprintf(file, ") ");
+                }
                 else
                     fprintf(file, "%s", leaf->toKen->toKen);
             }
             else
                 fprintf(file, "%s", leaf->toKen->toKen);
         }
-        if ((OM_LUA == mode) &&(ST_BITWISE != leaf->toKen->subType))
+        if ((OM_LUA == mode) && (ST_BITWISE != leaf->toKen->subType) && (LSL_LIST_ADD != leaf->toKen->type) && (LSL_LIST_CONCAT != leaf->toKen->type) && (LSL_LIST_ADD_LIST != leaf->toKen->type))
             outputLeaf(file, mode, leaf->right);
     }
 }
diff --git a/src/LuaSL/LuaSL_lemon_yaccer.y b/src/LuaSL/LuaSL_lemon_yaccer.y
index 72c4479..f03837e 100644
--- a/src/LuaSL/LuaSL_lemon_yaccer.y
+++ b/src/LuaSL/LuaSL_lemon_yaccer.y
@@ -165,6 +165,8 @@ expr(A) ::= LSL_BIT_NOT(B)			expr(C).				{ A = addOperation(compiler, NULL, B, C
 expr(A) ::= LSL_BOOL_NOT(B)                     expr(C).                                { A = addOperation(compiler, NULL, B, C); }
 expr(A) ::= LSL_SUBTRACT(B)                     expr(C).                [LSL_NEGATION]  { A = addOperation(compiler, NULL, B, C); }
 
+%left LSL_LIST_CONCAT LSL_LIST_ADD LSL_LIST_ADD_LIST.
+
 // Types, typecasts, and expression reordering.
 
 %right  LSL_TYPECAST_OPEN LSL_TYPECAST_CLOSE.