0
@@ -280,6 +280,10 @@ Benchmark.bmbm do |x|
0
     (MAX*4.8).to_i.times { STRING.dup.insert(a, "world") }
0
   }
0
 
0
+  run("String#inspect") {
0
+    (MAX*1.2).to_i.times { STRING.inspect }
0
+  }
0
+
0
   run("String#intern") {
0
     string = STRING * (((MAX*11.6).to_i / STRING.size) + 2)
0
     (MAX*0.1).to_i.times { string.chop!.intern }

0
@@ -6,6 +6,10 @@
0
 # See specs in spec/shotgun/ctype_spec.rb
0
 
0
 module CType
0
+  def isctrl
0
+    self == ?\n or self == ?\r or self == ?\t or self == ?\f or
0
+    self == ?\v or self == ?\a or self == ?\e or self == ?\b
0
+  end
0
 
0
   def isspace
0
     self == ?\s or self == ?\n or self == ?\t or self == ?\r or self == ?\f or self == ?\v
0
@@ -42,4 +46,33 @@ module CType
0
   def tolower
0
     self.isupper ? self.tolower! : self
0
   end
0
+
0
+  def toprint
0
+    if self == ?"
0
+      "\\\""
0
+    elsif self == ?\\
0
+      "\\\\"
0
+    elsif self == ?#
0
+      "\\#"
0
+    elsif isctrl
0
+      case self
0
+      when ?\n: "\\n"
0
+      when ?\t: "\\t"
0
+      when ?\a: "\\a"
0
+      when ?\v: "\\v"
0
+      when ?\f: "\\f"
0
+      when ?\r: "\\r"
0
+      when ?\e: "\\e"
0
+      when ?\b: "\\b"
0
+      end
0
+    elsif self < 32 || self > 126
0
+      str = "\\000"
0
+      str.modify!
0
+
0
+      c = self.to_s 8
0
+      str.copy_from c, 0, c.size, 4-c.size
0
+    else
0
+      self.chr
0
+    end
0
+  end
0
 end

0
@@ -57,9 +57,7 @@ class Integer < Numeric
0
 
0
   def chr
0
     raise RangeError.new("#{self} is out of the valid character range") if self > 255 || self < 0
0
-    a = "x"
0
-    a[0] = self
0
-    a
0
+    String.template 1, self
0
   end
0
   
0
   def [](index)

0
@@ -993,36 +993,16 @@ class String
0
   #   str[3] = 8
0
   #   str.inspect       #=> "hel\010o"
0
   def inspect
0
-    return "\"#{self}\"".copy_properties(self) if $KCODE == "UTF-8"
0
-    res = escaped("\"")
0
-    res << "\""
0
-    return res.copy_properties(self)
0
-  end
0
-
0
-  def escaped(res="")
0
-    self.each_byte do |char|
0
-      if ci = ControlCharacters.index(char)
0
-        res << ControlPrintValue[ci]
0
-      elsif char == ?"
0
-        res << "\\\""
0
-      elsif char == ?\\
0
-        res << "\\\\"
0
-      elsif char == ?#
0
-         res << "\\#"
0
-      elsif char < 32 or char > 126
0
-        v = char.to_s(8)
0
-        if v.size == 1
0
-          res << "\\00#{v}"
0
-        elsif v.size == 2
0
-          res << "\\0#{v}"
0
-        else
0
-          res << "\\#{v}"
0
-        end
0
-      else
0
-        res << char.chr
0
-      end
0
+    if $KCODE == "UTF-8"
0
+      str = "\"#{self}\""
0
+    else
0
+      str = "\""
0
+      i = -1
0
+      str << @data[i].toprint while (i += 1) < @bytes
0
+      str << "\""
0
     end
0
-    return res
0
+    str.taint if tainted?
0
+    str
0
   end
0
 
0
   # Returns the length of <i>self</i>.
0
@@ -2161,7 +2141,7 @@ class String
0
     end
0
   end
0
 
0
-  # Returns true if either the ByteArray object_id
0
+  # Raises RuntimeError if either the ByteArray object_id
0
   # or the size has changed.
0
   def modified?(id, size)
0
     if id != @data.object_id or size != @bytes
0
@@ -2254,18 +2234,10 @@ class String
0
   def dump
0
     kcode = $KCODE
0
     $KCODE = "NONE"
0
-    ret = self.inspect.copy_properties(self)
0
-    $KCODE = $KCODE
0
-    ret
0
-  end
0
-
0
-  def copy_properties(original)
0
-    ret = self.dup
0
-    ret.taint if original.tainted?
0
-    unless original.instance_of?(String)
0
-      ret = original.class.new(ret)
0
-    end
0
-    ret
0
+    str = self.class.new self.inspect
0
+    $KCODE = kcode
0
+    str.taint if tainted?
0
+    str
0
   end
0
 
0
   def to_sexp(name="(eval)",line=1,newlines=true)

0
@@ -37,4 +37,11 @@ describe "String#inspect" do
0
     "foo".taint.inspect.tainted?.should == true
0
     "foo\n".taint.inspect.tainted?.should == true
0
   end
0
+
0
+  it "does not return subclass instances" do
0
+    str = StringSpecs::MyString.new
0
+    str << "test"
0
+    str.should == "test"
0
+    str.inspect.class.should_not == StringSpecs::MyString
0
+  end
0
 end