nobu	2010-01-10 04:54:38 +0900 (Sun, 10 Jan 2010)

  New Revision: 26262

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26262

  Log:
    * class.c (rb_define_class): raise TypeError same as class
      statement.  [ruby-core:27504]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/class.c
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/class.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26261)
+++ ChangeLog	(revision 26262)
@@ -1,3 +1,8 @@
+Sun Jan 10 04:54:36 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* class.c (rb_define_class): raise TypeError same as class
+	  statement.  [ruby-core:27504]
+
 Sun Jan 10 04:41:20 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (configuration): needs ARCH_FLAG.
Index: class.c
===================================================================
--- class.c	(revision 26261)
+++ class.c	(revision 26262)
@@ -441,7 +441,7 @@
 	    rb_raise(rb_eTypeError, "%s is not a class", name);
 	}
 	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
-	    rb_name_error(id, "%s is already defined", name);
+	    rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
 	}
 	return klass;
     }
Index: ruby_1_8/class.c
===================================================================
--- ruby_1_8/class.c	(revision 26261)
+++ ruby_1_8/class.c	(revision 26262)
@@ -251,7 +251,7 @@
 	    rb_raise(rb_eTypeError, "%s is not a class", name);
 	}
 	if (rb_class_real(RCLASS(klass)->super) != super) {
-	    rb_name_error(id, "%s is already defined", name);
+	    rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
 	}
 	return klass;
     }
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 26261)
+++ ruby_1_8/ChangeLog	(revision 26262)
@@ -1,3 +1,8 @@
+Sun Jan 10 04:54:36 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* class.c (rb_define_class): raise TypeError same as class
+	  statement.  [ruby-core:27504]
+
 Sat Jan  9 08:40:54 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/configure.bat (WIN32DIR): regularise file separators.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 26261)
+++ ruby_1_8/version.h	(revision 26262)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-01-09"
+#define RUBY_RELEASE_DATE "2010-01-10"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100109
+#define RUBY_RELEASE_CODE 20100110
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/