From 8411f58ed70c1e6dc4e35589c94fd231c4e384d2 Mon Sep 17 00:00:00 2001 From: k0kubun Date: Tue, 12 Dec 2017 15:03:45 +0000 Subject: struct.c: show `keyword_init: true` on inspect for debugging if it's specified for the Struct class. This follows up r61137. We don't provide a method to check it because I don't think of any use case, but showing this to inspect would be helpful for debugging if someone is debugging whether keyword_init is properly enabled or not. In this commit, I didn't show `keyword_init: false` because of backward compatibility. Ideally any application should not depend on the behavior of inspect, but I don't have strong motivation to break it too. [close GH-1773] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- struct.c | 11 +++++++++++ test/ruby/test_struct.rb | 2 ++ 2 files changed, 13 insertions(+) diff --git a/struct.c b/struct.c index 056fd29ae8..e025228828 100644 --- a/struct.c +++ b/struct.c @@ -294,6 +294,16 @@ define_aset_method(VALUE nstr, VALUE name, VALUE off) rb_add_method_iseq(nstr, SYM2ID(name), iseq, NULL, METHOD_VISI_PUBLIC); } +static VALUE +rb_struct_s_inspect(VALUE klass) +{ + VALUE inspect = rb_class_name(klass); + if (RTEST(struct_ivar_get(klass, id_keyword_init))) { + rb_str_cat_cstr(inspect, "(keyword_init: true)"); + } + return inspect; +} + static VALUE setup_struct(VALUE nstr, VALUE members) { @@ -306,6 +316,7 @@ setup_struct(VALUE nstr, VALUE members) rb_define_singleton_method(nstr, "new", rb_class_new_instance, -1); rb_define_singleton_method(nstr, "[]", rb_class_new_instance, -1); rb_define_singleton_method(nstr, "members", rb_struct_s_members_m, 0); + rb_define_singleton_method(nstr, "inspect", rb_struct_s_inspect, 0); ptr_members = RARRAY_CONST_PTR(members); len = RARRAY_LEN(members); for (i=0; i< len; i++) { diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb index 817ad8c61e..384c95f85b 100644 --- a/test/ruby/test_struct.rb +++ b/test/ruby/test_struct.rb @@ -102,6 +102,8 @@ module TestStruct assert_raise(ArgumentError) { @Struct::KeywordInitTrue.new(1, b: 2) } assert_raise(ArgumentError) { @Struct::KeywordInitTrue.new(a: 1, b: 2, c: 3) } assert_equal @Struct::KeywordInitTrue.new(a: 1, b: 2).values, @Struct::KeywordInitFalse.new(1, 2).values + assert_equal "#{@Struct}::KeywordInitFalse", @Struct::KeywordInitFalse.inspect + assert_equal "#{@Struct}::KeywordInitTrue(keyword_init: true)", @Struct::KeywordInitTrue.inspect @Struct.instance_eval do remove_const(:KeywordInitTrue) -- cgit v1.2.3