mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/socket/mkconstants.rb (gen_int_to_name): don't compare constants
in preprocessor because the constants may be enum. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
90a65796e7
commit
270f2034a7
2 changed files with 13 additions and 12 deletions
|
@ -1,3 +1,8 @@
|
|||
Fri Jan 2 14:33:12 2009 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/socket/mkconstants.rb (gen_int_to_name): don't compare constants
|
||||
in preprocessor because the constants may be enum.
|
||||
|
||||
Fri Jan 2 14:11:07 2009 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/socket/mkconstants.rb (gen_int_to_name): add lenp argument.
|
||||
|
|
|
@ -104,19 +104,15 @@ def each_alias(pat)
|
|||
end
|
||||
|
||||
ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name(int_var, lenp_var, pat)")
|
||||
switch (<%=int_var%>) {
|
||||
% each_alias(pat) {|names|
|
||||
% names.each_with_index {|n, i|
|
||||
% cond = ["defined(#{n})"]
|
||||
% (0...i).each {|j| cond << "(!defined(#{names[j]}) || #{n} != #{names[j]})" }
|
||||
#if <%=cond.join(" && ")%>
|
||||
case <%=n%>: if (<%=lenp_var%>) *<%=lenp_var%> = <%=n.bytesize%>; return <%=c_str n%>;
|
||||
#endif
|
||||
% }
|
||||
% }
|
||||
default:
|
||||
return NULL;
|
||||
% each_name(pat) {|n|
|
||||
#ifdef <%=n%>
|
||||
if (<%=int_var%> == <%=n%>) {
|
||||
if (<%=lenp_var%>) *<%=lenp_var%> = <%=n.bytesize%>;
|
||||
return <%=c_str n%>;
|
||||
}
|
||||
#endif
|
||||
% }
|
||||
return NULL;
|
||||
EOS
|
||||
|
||||
result << ERB.new(<<'EOS', nil, '%').result(binding)
|
||||
|
|
Loading…
Reference in a new issue