jruby · Mar 17, 2015 · Mar 17, 2015
diff --git a/spec/truffle/tags/core/array/inspect_tags.txt b/spec/truffle/tags/core/array/inspect_tags.txt
@@ -1,7 +1 @@
-fails:Array#inspect represents a recursive element with '[...]'
-fails:Array#inspect taints the result if the Array is non-empty and tainted
-fails:Array#inspect taints the result if an element is tainted
-fails:Array#inspect untrusts the result if the Array is untrusted
-fails:Array#inspect untrusts the result if an element is untrusted
 fails:Array#inspect with encoding raises if inspected result is not default external encoding
-fails:Array#inspect with encoding use the default external encoding if it is ascii compatible
diff --git a/spec/truffle/tags/core/array/to_s_tags.txt b/spec/truffle/tags/core/array/to_s_tags.txt
@@ -1,7 +1 @@
-fails:Array#to_s represents a recursive element with '[...]'
-fails:Array#to_s taints the result if the Array is non-empty and tainted
-fails:Array#to_s taints the result if an element is tainted
-fails:Array#to_s untrusts the result if the Array is untrusted
-fails:Array#to_s untrusts the result if an element is untrusted
 fails:Array#to_s with encoding raises if inspected result is not default external encoding
-fails:Array#to_s with encoding use the default external encoding if it is ascii compatible
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
@@ -1672,48 +1672,6 @@ public Object insert(RubyArray array, int index, int value) {
 
     }
 
-    @CoreMethod(names = {"inspect", "to_s"})
-    public abstract static class InspectNode extends CoreMethodNode {
-
-        @Child private CallDispatchHeadNode inspect;
-
-        public InspectNode(RubyContext context, SourceSection sourceSection) {
-            super(context, sourceSection);
-            inspect = DispatchHeadNodeFactory.createMethodCall(context);
-        }
-
-        public InspectNode(InspectNode prev) {
-            super(prev);
-            inspect = prev.inspect;
-        }
-
-        @Specialization
-        public RubyString inspect(VirtualFrame frame, RubyArray array) {
-            notDesignedForCompilation();
-
-            final StringBuilder builder = new StringBuilder();
-            final Object[] objects = array.slowToArray();
-
-            builder.append("[");
-
-            for (int n = 0; n < objects.length; n++) {
-                if (n > 0) {
-                    builder.append(", ");
-                }
-
-                // TODO(CS): cast
-
-                final RubyString string = (RubyString) inspect.call(frame, objects[n], "inspect", null);
-                builder.append(string.getBytes().toString());
-            }
-
-            builder.append("]");
-
-            return getContext().makeString(builder.toString());
-        }
-
-    }
-
     @CoreMethod(names = "join", optional = 1)
     public abstract static class JoinNode extends ArrayCoreMethodNode {
 

diff --git a/truffle/src/main/ruby/core/rubinius/common/array.rb b/truffle/src/main/ruby/core/rubinius/common/array.rb
@@ -612,6 +612,28 @@ def flatten!(level=-1)
     nil
   end
 
+
+  def inspect
+    return "[]".force_encoding(Encoding::US_ASCII) if @total == 0
+    comma = ", "
+    result = "["
+
+    return "[...]" if Thread.detect_recursion self do
+      each_with_index do |element, index|
+        temp = element.inspect
+        result.force_encoding(temp.encoding) if index == 0
+        result << temp << comma
+      end
+    end
+
+    Rubinius::Type.infect(result, self)
+    result.shorten!(2)
+    result << "]"
+    result
+  end
+
+  alias_method :to_s, :inspect
+
   def keep_if(&block)
     return to_enum :keep_if unless block_given?
 

diff --git a/truffle/src/main/ruby/core/shims.rb b/truffle/src/main/ruby/core/shims.rb
@@ -104,6 +104,13 @@ class String
   def append(other)
     self << other
   end
+
+  def shorten!(size)
+    self.modify!
+    return if @num_bytes == 0
+    self.num_bytes -= size
+  end
+
 end
 
 module Kernel