* string.c (Init_String): undef Symbol#new.

* struct.c (rb_struct_s_def): wrong symbol detection.


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

1 files changed, 3 insertions, 8 deletions

diff --git a/struct.c b/struct.c
index b93f3383e9..cc09b093e8 100644
--- a/struct.c
+++ b/struct.c
@@ -282,14 +282,9 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass)
 	id = rb_to_id(RARRAY_PTR(rest)[i]);
 	RARRAY_PTR(rest)[i] = ID2SYM(id);
     }
-    if (!NIL_P(name)) {
-	VALUE tmp = rb_check_string_type(name);
-
-	if (NIL_P(tmp)) {
-	    id = rb_to_id(name);
-	    rb_ary_unshift(rest, ID2SYM(id));
-	    name = Qnil;
-	}
+    if (!NIL_P(name) && SYMBOL_P(name)) {
+	rb_ary_unshift(rest, name);
+	name = Qnil;
     }
     st = make_struct(name, rest, klass);
     if (rb_block_given_p()) {