Merge pull request rubinius#1249 from ctoneal/19_regexp_match

1.9: Fixed Regexp#match to throw TypeError if passed an Exception
DCarper · Oct 13, 2011 · 5749bc4 · 5749bc4
2 parents 8524fcb + e6c6043
commit 5749bc4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 4 deletions.
diff --git a/kernel/common/exception.rb b/kernel/common/exception.rb
@@ -111,8 +111,6 @@ def message
     to_s
   end
 
-  alias_method :to_str, :message
-
   def inspect
     "#<#{self.class.name}: #{self.to_s}>"
   end

diff --git a/kernel/common/exception18.rb b/kernel/common/exception18.rb
@@ -0,0 +1,3 @@
+class Exception
+  alias_method :to_str, :message
+end
diff --git a/kernel/common/exception19.rb b/kernel/common/exception19.rb
@@ -0,0 +1,2 @@
+class Exception
+end
diff --git a/kernel/common/load_order18.txt b/kernel/common/load_order18.txt
@@ -11,6 +11,7 @@ argf.rbc
 argf18.rbc
 tuple.rbc
 exception.rbc
+exception18.rbc
 undefined.rbc
 hash18.rbc
 type.rbc

diff --git a/kernel/common/load_order19.txt b/kernel/common/load_order19.txt
@@ -13,6 +13,7 @@ argf.rbc
 argf19.rbc
 tuple.rbc
 exception.rbc
+exception19.rbc
 undefined.rbc
 hash19.rbc
 hash_hamt.rbc

diff --git a/kernel/common/load_order20.txt b/kernel/common/load_order20.txt
@@ -12,6 +12,7 @@ enumerator19.rbc
 argf.rbc
 tuple.rbc
 exception.rbc
+exception19.rbc
 undefined.rbc
 hash19.rbc
 hash_hamt.rbc
@@ -85,6 +86,7 @@ objectspace.rbc
 string.rbc
 string19.rbc
 range.rbc
+range19.rbc
 struct.rbc
 process.rbc
 random.rbc

diff --git a/spec/tags/19/ruby/core/exception/to_str_tags.txt b/spec/tags/19/ruby/core/exception/to_str_tags.txt
diff --git a/spec/tags/19/ruby/core/regexp/match_tags.txt b/spec/tags/19/ruby/core/regexp/match_tags.txt