From ad5754162bddfd0ce2f11bd7fc7fce90ba6bf7ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lafortune?= Date: Sat, 29 Jan 2022 18:13:45 -0500 Subject: [ruby/ostruct] Avoid aliasing `block_given?` for JRuby [Fixes #40] https://github.com/ruby/ostruct/commit/14d04ff694 --- lib/ostruct.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/ostruct.rb b/lib/ostruct.rb index 8be8704135..258ae436e0 100644 --- a/lib/ostruct.rb +++ b/lib/ostruct.rb @@ -356,14 +356,14 @@ class OpenStruct # # person.delete_field('number') { 8675_309 } # => 8675309 # - def delete_field(name) + def delete_field(name, &block) sym = name.to_sym begin singleton_class.remove_method(sym, "#{sym}=") rescue NameError end @table.delete(sym) do - return yield if block_given! + return yield if block raise! NameError.new("no field `#{sym}' in #{self}", sym) end end @@ -467,6 +467,11 @@ class OpenStruct end # Other builtin private methods we use: alias_method :raise!, :raise - alias_method :block_given!, :block_given? - private :raise!, :block_given! + private :raise! + + # See https://github.com/ruby/ostruct/issues/40 + if RUBY_ENGINE != 'jruby' + alias_method :block_given!, :block_given? + private :block_given! + end end -- cgit v1.2.3