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

Drop support for old ERB

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-03-03 00:55:45 +09:00
parent 71d511615b
commit e9a7801a93
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
5 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
enc/make_encmake.rb
View File

@ -121,11 +121,7 @@ ENCS, ENC_DEPS = target_encodings
ATRANS, TRANS = target_transcoders ATRANS, TRANS = target_transcoders
if File.exist?(depend = File.join($srcdir, "depend")) if File.exist?(depend = File.join($srcdir, "depend"))
if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ erb = ERB.new(File.read(depend), trim_mode: '%')
erb = ERB.new(File.read(depend), trim_mode: '%')
else
erb = ERB.new(File.read(depend), nil, '%')
end
erb.filename = depend erb.filename = depend
tmp = erb.result(binding) tmp = erb.result(binding)
dep = "\n#### depend ####\n\n" << depend_rules(tmp).join dep = "\n#### depend ####\n\n" << depend_rules(tmp).join
@ -139,11 +135,7 @@ File.open(ARGV[0], 'wb') {|f|
} }
if MODULE_TYPE == :static if MODULE_TYPE == :static
filename = "encinit.c.erb" filename = "encinit.c.erb"
if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-')
erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-')
else
erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-')
end
erb.filename = "enc/#{filename}" erb.filename = "enc/#{filename}"
tmp = erb.result(binding) tmp = erb.result(binding)
begin begin

30
ext/socket/mkconstants.rb
View File

@ -76,15 +76,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 {|guard, name, default_value| % each_const {|guard, name, default_value|
#if !defined(<%=name%>) #if !defined(<%=name%>)
# if defined(HAVE_CONST_<%=name.upcase%>) # if defined(HAVE_CONST_<%=name.upcase%>)
@ -98,7 +94,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_in_guard(name, default_value)") erb_new.call(<<'EOS', '%').def_method(Object, "gen_const_defs_in_guard(name, default_value)")
#if defined(<%=name%>) #if defined(<%=name%>)
/* <%= COMMENTS[name] %> */ /* <%= COMMENTS[name] %> */
rb_define_const(rb_cSocket, <%=c_str name%>, INTEGER2NUM(<%=name%>)); rb_define_const(rb_cSocket, <%=c_str name%>, INTEGER2NUM(<%=name%>));
@ -107,7 +103,7 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(name
#endif #endif
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 {|guard, name, default_value| % each_const {|guard, name, default_value|
% if guard % if guard
#if <%=guard%> #if <%=guard%>
@ -157,7 +153,7 @@ def each_names_with_len(pat, prefix_optional=nil)
} }
end end
erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)") erb_new.call(<<'EOS', '%').def_method(Object, "gen_name_to_int_decl(funcname, pat, prefix_optional, guard=nil)")
%if guard %if guard
#ifdef <%=guard%> #ifdef <%=guard%>
int <%=funcname%>(const char *str, long len, int *valp); int <%=funcname%>(const char *str, long len, int *valp);
@ -167,7 +163,7 @@ int <%=funcname%>(const char *str, long len, int *valp);
%end %end
EOS EOS
erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)") erb_new.call(<<'EOS', '%').def_method(Object, "gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard=nil)")
int int
<%=funcname%>(const char *str, long len, int *valp) <%=funcname%>(const char *str, long len, int *valp)
{ {
@ -189,7 +185,7 @@ int
} }
EOS EOS
erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)") erb_new.call(<<'EOS', '%').def_method(Object, "gen_name_to_int_func(funcname, pat, prefix_optional, guard=nil)")
%if guard %if guard
#ifdef <%=guard%> #ifdef <%=guard%>
<%=gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard)%> <%=gen_name_to_int_func_in_guard(funcname, pat, prefix_optional, guard)%>
@ -218,7 +214,7 @@ def reverse_each_name_with_prefix_optional(pat, prefix_pat)
end end
end end
erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)") erb_new.call(<<'EOS', '%').def_method(Object, "gen_int_to_name_hash(hash_var, pat, prefix_pat)")
<%=hash_var%> = st_init_numtable(); <%=hash_var%> = st_init_numtable();
% reverse_each_name_with_prefix_optional(pat, prefix_pat) {|n,s| % reverse_each_name_with_prefix_optional(pat, prefix_pat) {|n,s|
#ifdef <%=n%> #ifdef <%=n%>
@ -227,7 +223,7 @@ erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_va
% } % }
EOS EOS
erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)") erb_new.call(<<'EOS', '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
ID ID
<%=func_name%>(int val) <%=func_name%>(int val)
{ {
@ -238,7 +234,7 @@ ID
} }
EOS EOS
erb_new.call(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)") erb_new.call(<<'EOS', '%').def_method(Object, "gen_int_to_name_decl(func_name, hash_var)")
ID <%=func_name%>(int val); ID <%=func_name%>(int val);
EOS EOS
@ -287,7 +283,7 @@ def_intern('rsock_intern_udp_optname', /\AUDP_/, "UDP_")
def_intern('rsock_intern_scm_optname', /\ASCM_/, "SCM_") def_intern('rsock_intern_scm_optname', /\ASCM_/, "SCM_")
def_intern('rsock_intern_local_optname', /\ALOCAL_/, "LOCAL_") def_intern('rsock_intern_local_optname', /\ALOCAL_/, "LOCAL_")
result = erb_new.call(<<'EOS', nil, '%').result(binding) result = erb_new.call(<<'EOS', '%').result(binding)
/* autogenerated file */ /* autogenerated file */
<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %> <%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
@ -330,7 +326,7 @@ init_constants(void)
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 %>
<%= NAME_TO_INT_DEFS.map {|decl, func| decl }.join("\n") %> <%= NAME_TO_INT_DEFS.map {|decl, func| decl }.join("\n") %>

6
tool/generic_erb.rb
View File

@ -27,11 +27,7 @@ vpath = out.vpath
output, vpath = output, vpath output, vpath = output, vpath
result = templates.map do |template| result = templates.map do |template|
if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ erb = ERB.new(File.read(template), trim_mode: '%-')
erb = ERB.new(File.read(template), trim_mode: '%-')
else
erb = ERB.new(File.read(template), nil, '%-')
end
erb.filename = template erb.filename = template
source ? erb.src : proc{erb.result(binding)}.call source ? erb.src : proc{erb.result(binding)}.call
end end

6
tool/ruby_vm/helpers/dumper.rb
View File

@ -33,11 +33,7 @@ class RubyVM::Dumper
rescue Errno::ENOENT rescue Errno::ENOENT
raise "don't know how to generate #{path}" raise "don't know how to generate #{path}"
else else
if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ erb = ERB.new(src, trim_mode: '%-')
erb = ERB.new(src, trim_mode: '%-')
else
erb = ERB.new(src, nil, '%-')
end
erb.filename = path.to_path erb.filename = path.to_path
return erb return erb
end end

6
tool/transcode-tblgen.rb
View File

@ -1078,11 +1078,7 @@ if __FILE__ == $0
end end
libs1 = $".dup libs1 = $".dup
if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ erb = ERB.new(src, trim_mode: '%')
erb = ERB.new(src, trim_mode: '%')
else
erb = ERB.new(src, nil, '%')
end
erb.filename = arg erb.filename = arg
erb_result = erb.result(binding) erb_result = erb.result(binding)
libs2 = $".dup libs2 = $".dup