From 483c7290f2509a9d5a3e193a66689971394d4de8 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 24 Dec 2018 00:48:15 +0000 Subject: enumerator.c: fix inspect with the last empty hash [ruby-core:90685] [Bug #15455] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enumerator.c | 2 +- test/ruby/test_enumerator.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/enumerator.c b/enumerator.c index 021daeba59..609fc71015 100644 --- a/enumerator.c +++ b/enumerator.c @@ -1105,7 +1105,7 @@ append_method(VALUE obj, VALUE str, ID default_method, VALUE default_args) rb_str_buf_cat2(str, "("); - if (RB_TYPE_P(argv[argc-1], T_HASH)) { + if (RB_TYPE_P(argv[argc-1], T_HASH) && !RHASH_EMPTY_P(argv[argc-1])) { int all_key = TRUE; rb_hash_foreach(argv[argc-1], key_symbol_p, (VALUE)&all_key); if (all_key) kwds = argv[--argc]; diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index afd356105d..efcfef580f 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -407,6 +407,12 @@ class TestEnumerator < Test::Unit::TestCase e = (0..10).each_cons(2) assert_equal("#", e.inspect) + e = (0..10).each_with_object({}) + assert_equal("#", e.inspect) + + e = (0..10).each_with_object(a: 1) + assert_equal("#", e.inspect) + e = Enumerator.new {|y| y.yield; 10 } assert_match(/\A#/, e.inspect) -- cgit v1.2.3