Commit: 79fb18445dec95c546b43a98b38b541674f89d93 - mruby_brightv_port (git)

mrubyを超漢字で動作させる

Commit MetaInfo

• Revisão: 79fb18445dec95c546b43a98b38b541674f89d93 (tree)
• Hora: 2014-07-12 23:22:20
• Autor: Yukihiro "Matz" Matsumoto <matz@ruby...>
• Commiter: Yukihiro "Matz" Matsumoto

Mensagem de Log

rescue SystemStackError that comes from inspecting self-referencing Hashes and Arrays; fix #2461

Mudança Sumário

• modified: mrblib/array.rb
• modified: mrblib/hash.rb
• modified: mrblib/kernel.rb

Diff

--- a/mrblib/array.rb
+++ b/mrblib/array.rb
@@ -84,13 +84,20 @@ class Array
     self
   end
 
+  def _inspect
+    return "[]" if self.size == 0
+    "["+self.map{|x|x.inspect}.join(", ")+"]"
+  end
   ##
-  # Private method for Array creation.
+  # Return the contents of this array as a string.
   #
   # ISO 15.2.12.5.31 (x)
   def inspect
-    return "[]" if self.size == 0
-    "["+self.map{|x|x.inspect}.join(", ")+"]"
+    begin
+      self._inspect
+    rescue SystemStackError
+      "[...]"
+    end
   end
   # ISO 15.2.12.5.32 (x)
   alias to_s inspect

--- a/mrblib/hash.rb
+++ b/mrblib/hash.rb
@@ -192,16 +192,24 @@ class Hash
     h
   end
 
-  ##
-  # Return the contents of this hash as a string.
-  #
-  # ISO 15.2.13.4.30 (x)
-  def inspect
+  # internal method for Hash inspection
+  def _inspect
     return "{}" if self.size == 0
     "{"+self.map {|k,v|
-      k.inspect + "=>" + v.inspect
+      k._inspect + "=>" + v._inspect
     }.join(", ")+"}"
   end
+  ##
+  # Return the contents of this hash as a string. 
+ #
+  # ISO 15.2.13.4.30 (x)
+  def inspect
+    begin
+      self._inspect
+    rescue SystemStackError
+      "{...}"
+    end
+  end
   # ISO 15.2.13.4.31 (x)
   alias to_s inspect
 

--- a/mrblib/kernel.rb
+++ b/mrblib/kernel.rb
@@ -39,6 +39,11 @@ module Kernel
     !(self =~ y)
   end
 
+  # internal method for inspect
+  def _inspect
+    self.inspect
+  end
+
   def to_enum(*a)
     raise NotImplementedError.new("fiber required for enumerator")
   end