From 591a3326e33889858276d66b157125273491edee Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Wed, 24 Jul 2019 15:20:40 -0400 Subject: [ruby/psych] Refactor `symbolize_names` https://github.com/ruby/psych/commit/3e472ab2d7 --- ext/psych/lib/psych.rb | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'ext/psych/lib/psych.rb') diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index c719b036d0..67024fbbd5 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -276,8 +276,7 @@ module Psych result = parse(yaml, filename: filename) return fallback unless result - result = result.to_ruby if result - symbolize_names!(result) if symbolize_names + result = result.to_ruby(symbolize_names: symbolize_names) if result result end @@ -353,12 +352,11 @@ module Psych permitted_symbols.map(&:to_s)) scanner = ScalarScanner.new class_loader visitor = if aliases - Visitors::ToRuby.new scanner, class_loader + Visitors::ToRuby.new scanner, class_loader, symbolize_names: symbolize_names else - Visitors::NoAliasRuby.new scanner, class_loader + Visitors::NoAliasRuby.new scanner, class_loader, symbolize_names: symbolize_names end result = visitor.accept result - symbolize_names!(result) if symbolize_names result end @@ -604,19 +602,6 @@ module Psych @dump_tags[klass] = tag end - def self.symbolize_names!(result) - case result - when Hash - result.keys.each do |key| - result[key.to_sym] = symbolize_names!(result.delete(key)) - end - when Array - result.map! { |r| symbolize_names!(r) } - end - result - end - private_class_method :symbolize_names! - # Workaround for emulating `warn '...', uplevel: 1` in Ruby 2.4 or lower. def self.warn_with_uplevel(message, uplevel: 1) at = parse_caller(caller[uplevel]).join(':') -- cgit v1.2.1