aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-15 14:25:09 +1000
committerDavid Walter Seikel2014-05-15 14:25:09 +1000
commite71248b83e1814752ec494a565178dd214da507f (patch)
tree0669d7a351948ac4c4de053597352938de001979 /src
parentSome more list adding and concatenation fixes. (diff)
downloadSledjHamr-e71248b83e1814752ec494a565178dd214da507f.zip
SledjHamr-e71248b83e1814752ec494a565178dd214da507f.tar.gz
SledjHamr-e71248b83e1814752ec494a565178dd214da507f.tar.bz2
SledjHamr-e71248b83e1814752ec494a565178dd214da507f.tar.xz
Properly fix list concatenation, I hope.
Diffstat (limited to 'src')
-rw-r--r--src/LuaSL/LuaSL_compile.c4
1 files changed, 2 insertions, 2 deletions
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,
491 break; 491 break;
492 492
493 case ST_CONCATENATION : 493 case ST_CONCATENATION :
494 // TODO - This doesn't work if the right side has been cast to a list. 494 // This is if the right side has been cast to a list.
495 if (OT_listList == lval->basicType) 495 if ((LSL_ASSIGNMENT_PLAIN != lval->toKen->type) && (OT_listList == lval->basicType))
496 { 496 {
497 lval->basicType = OT_list; 497 lval->basicType = OT_list;
498 lval->toKen = tokens[LSL_LIST_ADD_LIST - lowestToken]; 498 lval->toKen = tokens[LSL_LIST_ADD_LIST - lowestToken];