diff options
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/generic_erb.rb | 3 | ||||
| -rw-r--r-- | tool/ruby_vm/helpers/dumper.rb | 3 | ||||
| -rw-r--r-- | tool/transcode-tblgen.rb | 2 |
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, '%') |