summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-27 11:12:23 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-27 11:12:23 +0000
commit3406c5d61372e7b229cf2f925b89d5d9fd8728cd (patch)
tree23224a94bb0172874d15200a81416d1c2a206cf7 /tool
parent86d9071e0b81de7032cd52de0ec5f2af14a804c9 (diff)
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
Diffstat (limited to 'tool')
-rw-r--r--tool/generic_erb.rb3
-rw-r--r--tool/ruby_vm/helpers/dumper.rb3
-rw-r--r--tool/transcode-tblgen.rb2
3 files changed, 3 insertions, 5 deletions
diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb
index 42555ef0a0..8672907b99 100644
--- a/tool/generic_erb.rb
+++ b/tool/generic_erb.rb
@@ -34,8 +34,7 @@ unchanged = color.pass("unchanged")
updated = color.fail("updated")
result = templates.map do |template|
- match = ERB.version.match(/\Aerb\.rb \[(?<version>[^ ]+) /)
- if match && match[:version] >= '2.2.0' # Ruby 2.6+
+ if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
erb = ERB.new(File.read(template), trim_mode: '%-')
else
erb = ERB.new(File.read(template), nil, '%-')
diff --git a/tool/ruby_vm/helpers/dumper.rb b/tool/ruby_vm/helpers/dumper.rb
index 8ac8b1c4ce..ccd5717cc8 100644
--- a/tool/ruby_vm/helpers/dumper.rb
+++ b/tool/ruby_vm/helpers/dumper.rb
@@ -32,8 +32,7 @@ class RubyVM::Dumper
rescue Errno::ENOENT
raise "don't know how to generate #{path}"
else
- match = ERB.version.match(/\Aerb\.rb \[(?<version>[^ ]+) /)
- if match && match[:version] >= '2.2.0' # Ruby 2.6+
+ if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
erb = ERB.new(src, trim_mode: '%-')
else
erb = ERB.new(src, nil, '%-')
diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb
index 4e829314b2..c9867f95fa 100644
--- a/tool/transcode-tblgen.rb
+++ b/tool/transcode-tblgen.rb
@@ -1078,7 +1078,7 @@ if __FILE__ == $0
end
libs1 = $".dup
- if ERB.version[/\d+\.\d+/] >= '2.2'
+ if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
erb = ERB.new(src, trim_mode: '%')
else
erb = ERB.new(src, nil, '%')