1 files changed, 67 insertions, 45 deletions

diff --git a/LuaSL/src/LuaSL_LSL_tree.c b/LuaSL/src/LuaSL_LSL_tree.c
index 78da8e7..7ea5d67 100644
--- a/LuaSL/src/LuaSL_LSL_tree.c
+++ b/LuaSL/src/LuaSL_LSL_tree.c
@@ -1,63 +1,85 @@
 /*
  * Implementation of functions used to build the abstract syntax tree.
  */
- 
-#include "LuaSL_LSL_tree.h"
+
+#include "LuaSL_parser_param.h"
+#include "LuaSL_yaccer.tab.h"
 #include <stdlib.h>
- 
+
 /**
  * @brief Allocates space for expression
  * @return The expression or NULL if not enough memory
  */
-static SExpression* allocateExpression()
+static SExpression* newExpression(EOperationType type, SExpression *left, SExpression *right, int value)
 {
-        SExpression* b = malloc(sizeof *b);
- 
-        if( b == NULL ) return NULL;
- 
-        b->type = eVALUE;
-        b->value = 0;
- 
-        b->left = NULL;
-        b->right = NULL;
- 
-        return b;
+    SExpression* b = malloc(sizeof *b);
+
+    if (b == NULL) return NULL;
+
+    b->type = type;
+    b->value = value;
+    b->left = left;
+    b->right = right;
+
+    return b;
 }
- 
+
 SExpression* createNumber(int value)
 {
-        SExpression* b = allocateExpression();
- 
-        if( b == NULL ) return NULL;
- 
-        b->type = eVALUE;
-        b->value = value;
- 
-        return b;
+    return newExpression(eVALUE, NULL, NULL, value);
 }
- 
-SExpression *createOperation( 
-                        EOperationType type,
-                        SExpression *left,
-                        SExpression *right)
+
+SExpression *createOperation(EOperationType type, SExpression *left, SExpression *right)
 {
-        SExpression* b = allocateExpression();
- 
-        if( b == NULL ) return NULL;
- 
-        b->type = type;
-        b->left = left;
-        b->right = right;
- 
-        return b;
+    return newExpression(type, left, right, 0);
 }
- 
+
+int evaluate(SExpression *e)
+{
+    switch(e->type)
+    {
+        case eVALUE:
+            return e->value;
+        case eMULTIPLY:
+            return evaluate(e->left) * evaluate(e->right);
+        case ePLUS:
+            return evaluate(e->left) + evaluate(e->right);
+        default:
+            // shouldn't be here
+            return 0;
+    }
+}
+
 void deleteExpression(SExpression *b)
 {
-        if (b == NULL) return;
- 
-        deleteExpression(b->left);
-        deleteExpression(b->right);
- 
-        free(b);
+    if (b == NULL) return;
+
+    deleteExpression(b->left);
+    deleteExpression(b->right);
+
+    free(b);
+}
+
+SExpression *getAST(const char *expr)
+{
+    SParserParam p;
+    YY_BUFFER_STATE state;
+
+    p.expression = NULL;
+    if (yylex_init(&(p.scanner)))
+        return NULL;
+
+    state = yy_scan_string(expr, p.scanner);
+    if (yyparse(&p))
+        return NULL;
+
+    yy_delete_buffer(state, p.scanner);
+    yylex_destroy(p.scanner);
+    return p.expression;
+}
+
+int yyerror(const char *msg)
+{
+    fprintf(stderr,"Error:%s\n",msg); return 0;
 }
+