get rid of Bytes::borrowed

Author: iliabylich

src/bytes.cpp

@@ -16,10 +16,6 @@ namespace lib_ruby_parser
 
     Bytes::~Bytes()
     {
-        if (borrowed)
-        {
-            return;
-        }
         if (size_ != 0 && bytes_ != nullptr)
         {
             free(bytes_);
@@ -59,11 +55,9 @@ namespace lib_ruby_parser
     {
         this->size_ = other.size_;
         this->bytes_ = other.bytes_;
-        this->borrowed = other.borrowed;
 
         other.size_ = 0;
         other.bytes_ = nullptr;
-        other.borrowed = true;
     }
 
     Bytes &Bytes::operator=(Bytes &&other)
@@ -74,11 +68,9 @@ namespace lib_ruby_parser
         }
         this->size_ = other.size_;
         this->bytes_ = other.bytes_;
-        this->borrowed = other.borrowed;
 
         other.size_ = 0;
         other.bytes_ = nullptr;
-        other.borrowed = true;
 
         return *this;
     }
@@ -129,9 +121,10 @@ namespace lib_ruby_parser
         return byte_ptr_to_owned_string(utf8_ptr);
     }
 
-    void Bytes::mark_borrowed()
+    void Bytes::nullify()
     {
-        this->borrowed = true;
+        this->bytes_ = nullptr;
+        this->size_ = 0;
     }
 
     bool Bytes::operator==(const Bytes &other)

src/bytes.h

@@ -17,11 +17,6 @@ namespace lib_ruby_parser
         // Size of the byte sequence
         uint32_t size_;
 
-        // Indicates that Bytes are "borrowed",
-        // when set to true disables cleanup in destructor.
-        // TODO: remove this hack by making a cleanup on all call sites.
-        bool borrowed = false;
-
     public:
         // Destructor
         ~Bytes();
@@ -65,9 +60,7 @@ namespace lib_ruby_parser
         // Invalid UTF-8 bytes are replaced with a special REPLACEMENT char.
         std::string to_string_lossy() const;
 
-        // Marks `this` as borrowed, so that destructor will not free the inner pointer.
-        // TODO: remove this hack.
-        void mark_borrowed();
+        void nullify();
 
         bool operator==(const Bytes &other);
         bool operator==(const std::string &other);

src/low_level.cpp

@@ -108,9 +108,9 @@ namespace lib_ruby_parser
                 {
                     auto encoding = std::string(encoding_ptr.ptr, encoding_ptr.size);
                     auto input = Bytes((char *)input_ptr.ptr, input_ptr.size);
-                    input.mark_borrowed();
 
-                    auto cpp_result = decoder->rewrite(encoding, std::move(input));
+                    auto cpp_result = decoder->rewrite(encoding, input);
+                    input.nullify();
 
                     if (std::holds_alternative<Bytes>(cpp_result.data))
                     {
@@ -217,9 +217,9 @@ namespace lib_ruby_parser
                 {
                     auto token = token_from_raw_token(raw_token);
                     auto input = Bytes(input_ptr);
-                    input.mark_borrowed();
 
                     auto cpp_result = rewriter->rewrite_token(token, input);
+                    input.nullify();
 
                     RawTokenRewriterResult c_result;