From a13ab237c78f5bce21b7fc95690b0b173b427c1d Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 28 Jun 2015 03:07:37 +0000 Subject: class.c: TypeError when superclass mismatch * class.c (rb_define_class_id_under): raise TypeError exception same as ruby level class definition when superclass mismatch. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ NEWS | 4 ++++ class.c | 3 ++- test/ruby/test_require.rb | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aff8606662..a28e7f1340 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 28 12:07:35 2015 Nobuyoshi Nakada + + * class.c (rb_define_class_id_under): raise TypeError exception + same as ruby level class definition when superclass mismatch. + Sun Jun 14 19:02:03 2015 Benoit Daloze * lib/net/ftp.rb (makeport): close the TCPServer diff --git a/NEWS b/NEWS index b516ee88f4..b1e80ec764 100644 --- a/NEWS +++ b/NEWS @@ -143,6 +143,10 @@ with all sufficient information, see the ChangeLog file. === C API updates +* rb_define_class_id_under() now raises a TypeError exception when the + class is already defined but its superclass does not match the given + superclass, as well as definitions in ruby level. + === Build system updates === Implementation changes diff --git a/class.c b/class.c index f963f0c22a..991172acbb 100644 --- a/class.c +++ b/class.c @@ -703,7 +703,8 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super) rb_raise(rb_eTypeError, "%"PRIsVALUE" is not a class", rb_id2str(id)); } if (rb_class_real(RCLASS_SUPER(klass)) != super) { - rb_name_error(id, "%"PRIsVALUE" is already defined", rb_id2str(id)); + rb_raise(rb_eTypeError, "superclass mismatch for class %"PRIsVALUE"", + rb_id2str(id)); } return klass; } diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index e7a903d658..7c2a5d3aa8 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -228,7 +228,7 @@ class TestRequire < Test::Unit::TestCase assert_separately([], <<-INPUT) module Zlib; end class Zlib::Error; end - assert_raise(NameError) do + assert_raise(TypeError) do require 'zlib' end INPUT -- cgit v1.2.3