From 051eb93c188c15e3798018165991b0563bdbaa7f Mon Sep 17 00:00:00 2001 From: Dimitar Trendafilov Date: Mon, 22 Oct 2018 21:54:07 +0300 Subject: Enhanced tree interpreter - Added "proper" C++ like variable scoping - Added operator < - Added ++ and -- --- JSImpl/src/ASTInterpreter.h | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'JSImpl/src/ASTInterpreter.h') diff --git a/JSImpl/src/ASTInterpreter.h b/JSImpl/src/ASTInterpreter.h index 1ffecde..4d5b46f 100644 --- a/JSImpl/src/ASTInterpreter.h +++ b/JSImpl/src/ASTInterpreter.h @@ -11,10 +11,10 @@ public: ASTInterpreter(); ~ASTInterpreter(); - typedef double value_type; - typedef std::stack ValueStack; + typedef double value_type; + typedef IPLStack ValueStack; - ValueStack Run(Expression* program); + ValueStack Run(Expression* program); virtual void Visit(LiteralNull* e) override; virtual void Visit(LiteralUndefined* e) override; @@ -36,9 +36,19 @@ public: virtual void Visit(FunctionDeclaration* e) override; virtual void Visit(TopStatements* e) override; virtual void Visit(EmptyExpression* e) override; + + value_type& ModifyVariable(const IPLString& name); private: - void RunExpression(const ExpressionPtr& e); - bool EvalToBool(const ExpressionPtr& e); - ValueStack m_Evaluation; - std::unordered_map m_Variables; + void RunExpression(const ExpressionPtr& e); + bool EvalToBool(const ExpressionPtr& e); + + void EnterScope(); + void LeaveScope(); + friend struct VariableScope; + + ValueStack m_Evaluation; + IPLUnorderedMap m_Variables; + + typedef IPLVector Scope; + IPLStack m_Scopes; }; -- cgit v1.3.1-26-gb76a