Skip to content

Drop support for old ERB #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nobu merged 1 commit into from
Mar 2, 2024
Merged

Drop support for old ERB #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions ext/etc/mkconstants.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%>)
Expand All @@ -101,7 +97,7 @@ def each_name(pat)
% }
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]
Expand All @@ -112,13 +108,13 @@ def each_name(pat)
% }
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
Expand Down