[Truffle] String#num_bytes= and primitive :string_resize_capacity

jruby · Mar 14, 2015 · 4feca49 · eregon · Mar 14, 2015 · chrisseaton
1 parent cf89fd2
commit 4feca49
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 55 deletions.
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/append_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/append_tags.txt
@@ -1,8 +1,2 @@
-fails:StringIO#<< when passed [Object] returns self
 fails:StringIO#<< when passed [Object] writes the passed argument onto self
 fails:StringIO#<< when passed [Object] writes the passed argument at the current position
-fails:StringIO#<< when passed [Object] pads self with \000 when the current position is after the end
-fails:StringIO#<< when passed [Object] taints self's String when the passed argument is tainted
-fails:StringIO#<< when passed [Object] does not taint self when the passed argument is tainted
-fails:StringIO#<< when passed [Object] updates self's position
-fails:StringIO#<< when passed [Object] tries to convert the passed argument to a String using #to_s
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/close_read_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/close_read_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/print_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/print_tags.txt
@@ -1,10 +1,7 @@
 fails:StringIO#print prints $_ when passed no arguments
 fails:StringIO#print prints the passed arguments to self
 fails:StringIO#print tries to convert the passed Object to a String using #to_s
-fails:StringIO#print returns nil
 fails:StringIO#print pads self with \000 when the current position is after the end
-fails:StringIO#print honors the output record separator global
 fails:StringIO#print updates the current position
-fails:StringIO#print correctly updates the current position when honoring the output record separator global
 fails:StringIO#print when in append mode appends the passed argument to the end of self
 fails:StringIO#print when in append mode correctly updates self's position
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/printf_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/printf_tags.txt
@@ -1,4 +1 @@
-fails:StringIO#printf returns nil
-fails:StringIO#printf pads self with \000 when the current position is after the end
 fails:StringIO#printf performs format conversion
-fails:StringIO#printf updates the current position
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/putc_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/putc_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/reopen_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/reopen_tags.txt
@@ -6,5 +6,4 @@ fails:StringIO#reopen when passed [Object, Integer] raises an Errno::EACCES when
 fails:StringIO#reopen when passed [Object, Integer] raises a TypeError when trying to reopen self with a frozen String in truncate-mode
 fails:StringIO#reopen when passed [Object, Integer] raises a RuntimeError when trying to reopen self with a frozen String in truncate-mode
 fails:StringIO#reopen when passed [Object, Integer] does not raise IOError when passed a frozen String in read-mode
-fails:StringIO#reopen reopens a stream when given a String argument
 fails:StringIO#reopen does not truncate the content even when the StringIO argument is in the truncate mode
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/syswrite_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/syswrite_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/write_nonblock_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/write_nonblock_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-stringio/spec/write_tags.txt b/spec/truffle/tags/rubysl/rubysl-stringio/spec/write_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -2213,4 +2213,22 @@ public static ByteList swapcase(RubyString string) {
         }
     }
 
+    @CoreMethod(names = "_set_num_bytes", required = 1)
+    public abstract static class SetNumBytesNode extends CoreMethodNode {
+
+        public SetNumBytesNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public SetNumBytesNode(SetNumBytesNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public RubyString setNumBytes(RubyString string, int count) {
+            string.getByteList().view(0, count);
+            return string;
+        }
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
@@ -624,8 +624,9 @@ public StringResizeCapacityPrimitiveNode(StringResizeCapacityPrimitiveNode prev)
         }
 
         @Specialization
-        public Object stringResizeCapacity(RubyString string, Object capacity) {
-            throw new UnsupportedOperationException("string_resize_capacity");
+        public RubyString stringResizeCapacity(RubyString string, int capacity) {
+            string.getByteList().ensure(capacity);
+            return string;
         }
 
     }

diff --git a/truffle/src/main/ruby/core/shims.rb b/truffle/src/main/ruby/core/shims.rb
@@ -199,4 +199,16 @@ def [](index)
       @array[index]
     end
   end
-end
+end
+
+class String
+
+  def modify!
+    # TODO CS 14-Mar-15 what does this do?
+  end
+
+  def num_bytes=(count)
+    _set_num_bytes count
+  end
+
+end