Merge pull request #1914 from opal/elia/remove-marshal-binary-string

Remove Marshal::BinaryString
opal · Dec 26, 2018 · d8edec7 · d8edec7
2 parents 48c2305 + fef7ad3
commit d8edec7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/opal/corelib/marshal.rb b/opal/corelib/marshal.rb
@@ -5,18 +5,6 @@ module Marshal
   MAJOR_VERSION = 4
   MINOR_VERSION = 8
 
-  # For simulating binary strings
-  #
-  class BinaryString < String
-    def encoding
-      Encoding::BINARY
-    end
-
-    def +(other)
-      BinaryString.new(super)
-    end
-  end
-
   class << self
     def dump(object)
       WriteBuffer.new(object).write

diff --git a/opal/corelib/marshal/write_buffer.rb b/opal/corelib/marshal/write_buffer.rb
@@ -182,9 +182,17 @@ module Marshal
   class WriteBuffer
     attr_reader :buffer
 
+    %x{
+      function binaryString(s) {
+        s = new String(s);
+        s.encoding = #{Encoding::BINARY};
+        return s;
+      }
+    }
+
     def initialize(object)
       @object = object
-      @buffer = BinaryString.new
+      @buffer = ''
       @cache = []
       @extends = Hash.new { |h, k| h[k] = [] }
       append(version)
@@ -212,7 +220,7 @@ def write(object = @object)
         end
       end
 
-      @buffer
+      `binaryString(#{@buffer})`
     end
 
     def write_fixnum(n)
@@ -398,7 +406,7 @@ def write_ivars_prefix(object)
     end
 
     def append(s)
-      @buffer += s
+      `#{@buffer} += #{s}`
     end
 
     def version