* ext/socket/mkconstants.rb: generate rb_define_const directly for

  rdoc.

* ext/.document: add socket/constdefs.c.

* ext/socket/constants.c (sock_define_const): removed.
  (sock_define_uconst): ditto.
  (rb_mSockConst): new static variable.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 15 insertions, 10 deletions

diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 17a6d12f05..101d5a956e 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -51,16 +51,16 @@ DEFS = h.to_a
 def each_const
   DEFS.each {|name, default_value|
     if name =~ /\AINADDR_/
-      define = "sock_define_uconst"
+      make_value = "UINT2NUM"
     else
-      define = "sock_define_const"
+      make_value = "INT2NUM"
     end
     guard = nil
     if /\A(AF_INET6|PF_INET6)\z/ =~ name
       # IPv6 is not supported although AF_INET6 is defined on bcc32/mingw
       guard = "defined(INET6)"
     end
-    yield guard, define, name, default_value
+    yield guard, make_value, name, default_value
   }
 end
 
@@ -72,7 +72,7 @@ def each_name(pat)
 end
 
 ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
-% each_const {|guard, define, name, default_value|
+% each_const {|guard, make_value, name, default_value|
 %   if default_value
 #ifndef <%=name%>
 # define <%=name%> <%=default_value%>
@@ -81,20 +81,21 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_decls")
 % }
 EOS
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(define, name, default_value)")
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(make_value, name, default_value)")
 #if defined(<%=name%>)
-    <%=define%>(<%=c_str name%>, <%=name%>);
+    rb_define_const(rb_cSocket, <%=c_str name%>, <%=make_value%>(<%=name%>));
+    rb_define_const(rb_mSockConst, <%=c_str name%>, <%=make_value%>(<%=name%>));
 #endif
 EOS
 
 ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs")
-% each_const {|guard, define, name, default_value|
+% each_const {|guard, make_value, name, default_value|
 %   if guard
 #if <%=guard%>
-<%= gen_const_defs_in_guard(define, name, default_value).chomp %>
+<%= gen_const_defs_in_guard(make_value, name, default_value).chomp %>
 #endif
 %   else
-<%= gen_const_defs_in_guard(define, name, default_value).chomp %>
+<%= gen_const_defs_in_guard(make_value, name, default_value).chomp %>
 %   end
 % }
 EOS
@@ -272,8 +273,12 @@ result = ERB.new(<<'EOS', nil, '%').result(binding)
 <%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
 
 static void
-init_constants(VALUE mConst)
+init_constants(void)
 {
+    /* for rdoc */
+    /* rb_cSocket = rb_define_class("Socket", rb_cBasicSocket); */
+    /* rb_mSockConst = rb_define_module_under(rb_cSocket, "Constants"); */
+
 <%= gen_const_defs %>
 <%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| gen_hash }.join("\n") %>
 }