From 5f85353c1318e9c1ddd1013dd4b5ab613030c84f Mon Sep 17 00:00:00 2001 From: k0kubun Date: Tue, 27 Feb 2018 11:12:23 +0000 Subject: Refactor ERB version checking for keyword arguments Improving code like r62590. See r62529 for details. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enc/make_encmake.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'enc/make_encmake.rb') diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb index dc4b5ef6b2..bc0597e3f4 100755 --- a/enc/make_encmake.rb +++ b/enc/make_encmake.rb @@ -121,7 +121,7 @@ ENCS, ENC_DEPS = target_encodings ATRANS, TRANS = target_transcoders if File.exist?(depend = File.join($srcdir, "depend")) - if ERB.version[/\d+\.\d+/] >= '2.2' + if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ erb = ERB.new(File.read(depend), trim_mode: '%') else erb = ERB.new(File.read(depend), nil, '%') @@ -139,7 +139,7 @@ open(ARGV[0], 'wb') {|f| } if MODULE_TYPE == :static filename = "encinit.c.erb" - if ERB.version[/\d+\.\d+/] >= '2.2' + if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-') else erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-') -- cgit v1.2.3