Skip to content

Avoid aliasing block_given? for JRuby [Fixes #40] #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcandre merged 1 commit into from
Mar 24, 2022
Merged

Avoid aliasing block_given? for JRuby [Fixes #40] #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lib/ostruct.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,14 +356,14 @@ def dig(name, *names)
#
# 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
Expand Down Expand Up @@ -467,6 +467,11 @@ def init_with(coder) # :nodoc:
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