Use pointers instead of references to track SExpr memory location

john-z-yang · Nov 20, 2023 · 67b05f4 · 67b05f4
1 parent a832110
commit 67b05f4
Show file tree

Hide file tree

Showing 49 changed files with 465 additions and 452 deletions.
diff --git a/src/code/Code.cpp b/src/code/Code.cpp
@@ -17,7 +17,7 @@ InstrPtr Code::pushCode(const uint8_t code, const unsigned int lineNum) {
   return byteCodes.size() - 1;
 }
 
-uint8_t Code::pushConst(const SExpr &sExpr) {
+uint8_t Code::pushConst(const SExpr *sExpr) {
   consts.push_back(sExpr);
   return consts.size() - 1;
 }
@@ -89,9 +89,9 @@ std::ostream &code::operator<<(std::ostream &o, const Code &code) {
 
     switch (byte) {
     case OpCode::MAKE_CLOSURE: {
-      const auto &fn = cast<Prototype>(code.consts[READ_BYTE()].get());
+      const auto fn = cast<Prototype>(code.consts[READ_BYTE()]);
       o << "MAKE_CLOSURE" << fn;
-      for (unsigned int i{0}; i < fn.numUpvals; i++) {
+      for (unsigned int i{0}; i < fn->numUpvals; i++) {
         const auto isLocal = unsigned(READ_BYTE());
         const auto idx = unsigned(READ_BYTE());
         o << std::endl

diff --git a/src/code/Code.hpp b/src/code/Code.hpp
@@ -14,13 +14,13 @@ class Code {
 
 public:
   std::vector<uint8_t> byteCodes;
-  std::vector<std::reference_wrapper<const sexpr::SExpr>> consts;
+  std::vector<const sexpr::SExpr *> consts;
 
   std::vector<unsigned int> lineNums;
 
   InstrPtr pushCode(const uint8_t code);
   InstrPtr pushCode(const uint8_t code, const unsigned int lineNum);
-  uint8_t pushConst(const sexpr::SExpr &sExpr);
+  uint8_t pushConst(const sexpr::SExpr *sExpr);
 
   void patchJump(const InstrPtr idx);
 };