diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2024-03-03 00:55:45 +0900 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2024-03-02 16:40:16 +0000 |
| commit | 93556d46203545bc2364b1c0dd1281ba098f3cc9 (patch) | |
| tree | 6d16bc3ae857f4dc941f01e120240f1c55e3f89c /ext/etc/mkconstants.rb | |
| parent | e9a7801a938a6e4e0d071dec05e1ecdb99606bbf (diff) | |
[ruby/etc] Drop support for old ERB
https://github.com/ruby/etc/commit/11677318ac
Diffstat (limited to 'ext/etc/mkconstants.rb')
| -rw-r--r-- | ext/etc/mkconstants.rb | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ext/etc/mkconstants.rb b/ext/etc/mkconstants.rb index c8ebb67767..a766560a8a 100644 --- a/ext/etc/mkconstants.rb +++ b/ext/etc/mkconstants.rb @@ -79,15 +79,11 @@ def each_name(pat) } end -erb_new = lambda do |src, safe, trim| - if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ - ERB.new(src, trim_mode: trim) - else - ERB.new(src, safe, trim) - end +erb_new = lambda do |src, trim| + ERB.new(src, trim_mode: trim) end -erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls") +erb_new.call(<<'EOS', '%').def_method(Object, "gen_const_decls") % each_const {|name, default_value| #if !defined(<%=name%>) # if defined(HAVE_CONST_<%=name.upcase%>) @@ -101,7 +97,7 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls") % } EOS -erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs") +erb_new.call(<<'EOS', '%').def_method(Object, "gen_const_defs") % each_const {|name, default_value| #if defined(<%=name%>) % if comment = COMMENTS[name] @@ -112,13 +108,13 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs") % } EOS -header_result = erb_new.call(<<'EOS', nil, '%').result(binding) +header_result = erb_new.call(<<'EOS', '%').result(binding) /* autogenerated file */ <%= gen_const_decls %> EOS -result = erb_new.call(<<'EOS', nil, '%').result(binding) +result = erb_new.call(<<'EOS', '%').result(binding) /* autogenerated file */ #ifdef HAVE_LONG_LONG |