store local variables inside script

Author: Prevter

include/rift/script.hpp

@@ -21,15 +21,19 @@ namespace rift {
         Script(Script const&) = delete;
         Script(Script&&) = delete;
 
-        [[nodiscard]] RunResult run(Object const& variables = {}) const noexcept;
-        [[nodiscard]] EvalResult eval(Object const& variables = {}) const noexcept;
+        [[nodiscard]] RunResult run(Object const& variables = {}) noexcept;
+        [[nodiscard]] EvalResult eval(Object const& variables = {}) noexcept;
 
         [[nodiscard]] std::string toDebugString() const noexcept {
             return m_root->toDebugString();
         }
 
+        [[nodiscard]] Object& getVariables() noexcept { return m_variables; }
+        [[nodiscard]] Object const& getVariables() const noexcept { return m_variables; }
+
     private:
         std::unique_ptr<Node> m_root;
+        Object m_variables;
     };
 
 }

include/rift/visitor.hpp

@@ -21,7 +21,8 @@ namespace rift {
 
     class Visitor {
     public:
-        explicit Visitor(Object const& variables) noexcept : m_variables(variables) {}
+        explicit Visitor(Object const& variables, Object& localVariables) noexcept
+            : m_variables(variables), m_localVariables(localVariables) {}
 
         /// @brief Visit a node and evaluate its value.
         /// @param node the node to visit
@@ -85,7 +86,7 @@ namespace rift {
 
     private:
         std::reference_wrapper<Object const> m_variables;
-        Object m_localVariables;
+        std::reference_wrapper<Object> m_localVariables;
     };
 
 }

src/script.cpp

@@ -3,16 +3,16 @@
 
 namespace rift {
 
-    RunResult Script::run(Object const &variables) const noexcept {
+    RunResult Script::run(Object const &variables) noexcept {
         auto result = eval(variables);
         if (result.isErr()) {
             return geode::Err(std::move(result.unwrapErr()));
         }
         return geode::Ok(result.unwrap().toString());
     }
 
-    EvalResult Script::eval(Object const &variables) const noexcept {
-        Visitor visitor(variables);
+    EvalResult Script::eval(Object const &variables) noexcept {
+        Visitor visitor(variables, m_variables);
         auto result = visitor.visit(*m_root);
         if (result.isErr()) {
             return geode::Err(std::move(result.unwrapErr()));

src/visitor.cpp

@@ -54,7 +54,7 @@ namespace rift {
 
     VisitorResult Visitor::visit(IdentifierNode const& node) noexcept {
         // check local variables
-        if (auto it = m_localVariables.find(node.name()); it != m_localVariables.end()) {
+        if (auto it = m_localVariables.get().find(node.name()); it != m_localVariables.get().end()) {
             return geode::Ok(it->second);
         }
 
@@ -239,7 +239,7 @@ namespace rift {
         switch (iterValue.type()) {
             case Value::Type::String: {
                 for (auto const& c : iterValue.toString()) {
-                    m_localVariables[var] = Value(std::string(1, c));
+                    m_localVariables.get()[var] = Value(std::string(1, c));
                     auto res = visit(node.getBody());
                     if (res.isErr()) {
                         return res;
@@ -253,7 +253,7 @@ namespace rift {
                     return node.error(fmt::format("For loop: {} -> {} : {} exceeds max iterations", var, iter.unwrap().toString(), maxIters));
                 }
                 for (auto const& val : arr) {
-                    m_localVariables[var] = val;
+                    m_localVariables.get()[var] = val;
                     auto res = visit(node.getBody());
                     if (res.isErr()) {
                         return res;
@@ -267,7 +267,7 @@ namespace rift {
                     return node.error(fmt::format("For loop: {} -> {} : {} exceeds max iterations", var, iter.unwrap().toString(), maxIters));
                 }
                 for (auto const& [key, val] : obj) {
-                    m_localVariables[var] = key;
+                    m_localVariables.get()[var] = key;
                     auto res = visit(node.getBody());
                     if (res.isErr()) {
                         return res;
@@ -284,7 +284,7 @@ namespace rift {
                     return node.error(fmt::format("For loop: {} -> {} : {} exceeds max iterations", var, iter.unwrap().toString(), maxIters));
                 }
                 for (int64_t i = 0; i < max; ++i) {
-                    m_localVariables[var] = Value(i);
+                    m_localVariables.get()[var] = Value(i);
                     auto res = visit(node.getBody());
                     if (res.isErr()) {
                         return res;
@@ -319,7 +319,7 @@ namespace rift {
             return value;
         }
 
-        m_localVariables[node.getName()] = value.unwrap();
+        m_localVariables.get()[node.getName()] = value.unwrap();
         return geode::Ok(std::move(value.unwrap()));
     }
 }