Rework function evaluation scope to handle tables

2019-06-12 17:56:47 +02:00
parent c022c91777
commit 3477ddd18c
7 changed files with 57 additions and 30 deletions
--- a/src/Evaluator/Evaluator.hpp
+++ b/src/Evaluator/Evaluator.hpp
@@ -20,7 +20,7 @@ class Evaluator {
    shared_ptr<EvalValue> _lastValue;

    Script* _scriptData;
-    EvaluationScope* _evaluationScope;
+    shared_ptr<EvaluationScope> _evaluationScope;

    void EvaluateStatement(BoundStatement* statement);
    void EvaluateBlockStatement(BoundBlockStatement* statement, bool clearScope);
@@ -57,10 +57,6 @@ public:
        _evaluationScope = nullptr;
    }

-    ~Evaluator(){
-        delete _evaluationScope;
-    }
-
    void Evaluate(BoundScriptStatement* statement);
    shared_ptr<EvalValue> EvaluateFunction(ScriptFunctionEvalValue* func, vector<EvalValue*> parameters);