From e71248b83e1814752ec494a565178dd214da507f Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 15 May 2014 14:25:09 +1000
Subject: Properly fix list concatenation, I hope.

---
 src/LuaSL/LuaSL_compile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c
index 492f234..9695bef 100644
--- a/src/LuaSL/LuaSL_compile.c
+++ b/src/LuaSL/LuaSL_compile.c
@@ -491,8 +491,8 @@ LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval,
 				break;
 
 			    case ST_CONCATENATION :
-				// TODO - This doesn't work if the right side has been cast to a list.
-				if (OT_listList == lval->basicType)
+				// This is if the right side has been cast to a list.
+				if ((LSL_ASSIGNMENT_PLAIN != lval->toKen->type) && (OT_listList == lval->basicType))
 				{
 				    lval->basicType = OT_list;
 				    lval->toKen = tokens[LSL_LIST_ADD_LIST - lowestToken];
-- 
cgit v1.1