Evaluate expressions using the new token table.

1 files changed, 7 insertions, 3 deletions

diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/src/LuaSL_LSL_tree.h
index 1c6710d..0d49737 100644
--- a/LuaSL/src/LuaSL_LSL_tree.h
+++ b/LuaSL/src/LuaSL_LSL_tree.h
@@ -182,9 +182,15 @@ typedef union LSL_Leaf
     LSL_Script                  *scriptValue;
 } LSL_Leaf;
 
+typedef struct
+{
+    LSL_Type            type;
+    LSL_Leaf            content;
+} LSL_Value;
+
 typedef void (*convertToken2Lua) (LSL_Leaf *content);
 typedef void (*outputToken) (LSL_Leaf *content);
-typedef LSL_Leaf *(*evaluateToken) (LSL_Leaf  *content, LSL_Type oldType, LSL_Leaf *old);
+typedef void (*evaluateToken) (LSL_Leaf  *content, LSL_Value *result);
 
 typedef struct
 {
@@ -208,7 +214,6 @@ typedef struct LSL_Expression
     struct LSL_Expression       *left;
     struct LSL_Expression       *right;
     LSL_Token                   *token;
-    LSL_Type                    type;
     LSL_Leaf                    content;
 } LSL_Expression;
 
@@ -219,7 +224,6 @@ typedef struct LSL_AST
     int                 line;
     int                 character;
     LSL_Token           *token;
-    LSL_Type            type;
     LSL_Leaf            content;
 } LSL_AST;