* re.c (reg_operand): Simplify and reuse error handling [Bug #7539]

* test/ruby/test_regexp.rb: Test for above

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 0 deletions

diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index e9c866a9ca..308b30ae9c 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -929,4 +929,11 @@ class TestRegexp < Test::Unit::TestCase
     # use Regexp.new instead of literal to ignore a parser warning.
     check(Regexp.new('[0-1-\\s]'), [' ', '-'], ['2', 'a'], bug6853)
   end
+
+  def test_error_message_on_failed_conversion
+    bug7539 = '[ruby-core:50733]'
+    assert_equal false, /x/=== 42
+    err = assert_raise(TypeError){ Regexp.quote(42) }
+    assert_equal 'no implicit conversion of Fixnum into String', err.message, bug7539
+  end
 end