1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/etc] Drop support for old ERB

Browse Source 
https://github.com/ruby/etc/commit/11677318ac
This commit is contained in:
Nobuyoshi Nakada 2024-03-03 00:55:45 +09:00 committed by git
parent e9a7801a93
commit 93556d4620
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/etc/mkconstants.rb
View File

@ -79,15 +79,11 @@ def each_name(pat)
} }
end end
erb_new = lambda do |src, safe, trim| erb_new = lambda do |src, trim|
if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ ERB.new(src, trim_mode: trim)
ERB.new(src, trim_mode: trim)
else
ERB.new(src, safe, trim)
end
end 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| % each_const {|name, default_value|
#if !defined(<%=name%>) #if !defined(<%=name%>)
# if defined(HAVE_CONST_<%=name.upcase%>) # if defined(HAVE_CONST_<%=name.upcase%>)
@ -101,7 +97,7 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
% } % }
EOS 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| % each_const {|name, default_value|
#if defined(<%=name%>) #if defined(<%=name%>)
% if comment = COMMENTS[name] % if comment = COMMENTS[name]
@ -112,13 +108,13 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
% } % }
EOS EOS
header_result = erb_new.call(<<'EOS', nil, '%').result(binding) header_result = erb_new.call(<<'EOS', '%').result(binding)
/* autogenerated file */ /* autogenerated file */
<%= gen_const_decls %> <%= gen_const_decls %>
EOS EOS
result = erb_new.call(<<'EOS', nil, '%').result(binding) result = erb_new.call(<<'EOS', '%').result(binding)
/* autogenerated file */ /* autogenerated file */
#ifdef HAVE_LONG_LONG #ifdef HAVE_LONG_LONG