* 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, 1 insertions, 6 deletions

diff --git a/re.c b/re.c
index 17612d48f4..4e57971364 100644
--- a/re.c
+++ b/re.c
@@ -2667,12 +2667,7 @@ reg_operand(VALUE s, int check)
 	return rb_sym_to_s(s);
     }
     else {
-	VALUE tmp = rb_check_string_type(s);
-	if (check && NIL_P(tmp)) {
-	    rb_raise(rb_eTypeError, "can't convert %s to String",
-		     rb_obj_classname(s));
-	}
-	return tmp;
+	return (check ? rb_str_to_str : rb_check_string_type)(s);
     }
 }