akr	2009-02-17 01:55:33 +0900 (Tue, 17 Feb 2009)

  New Revision: 22361

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22361

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/ext/.document
    trunk/ext/socket/constants.c
    trunk/ext/socket/mkconstants.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22360)
+++ ChangeLog	(revision 22361)
@@ -1,3 +1,14 @@
+Tue Feb 17 01:53:35 2009  Tanaka Akira  <akr@f...>
+
+	* 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.
+
 Mon Feb 16 23:14:51 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove
Index: ext/.document
===================================================================
--- ext/.document	(revision 22360)
+++ ext/.document	(revision 22361)
@@ -23,6 +23,7 @@
 socket/option.c
 socket/ancdata.c
 socket/constants.c
+socket/constdefs.c
 socket/lib/socket.rb
 stringio/stringio.c
 strscan/strscan.c
Index: ext/socket/constants.c
===================================================================
--- ext/socket/constants.c	(revision 22360)
+++ ext/socket/constants.c	(revision 22361)
@@ -10,13 +10,9 @@
 
 #include "rubysocket.h"
 
-static void sock_define_const(const char *name, int value, VALUE mConst);
-static void sock_define_uconst(const char *name, unsigned int value, VALUE mConst);
-#define sock_define_const(name, value) sock_define_const(name, value, mConst)
-#define sock_define_uconst(name, value) sock_define_uconst(name, value, mConst)
+static VALUE rb_mSockConst;
+
 #include "constdefs.c"
-#undef sock_define_const
-#undef sock_define_uconst
 
 static int
 constant_arg(VALUE arg, int (*str_to_int)(const char*, int, int*), const char *errmsg)
@@ -138,29 +134,13 @@
     return constant_arg(how, shutdown_how_to_int, "unknown shutdown argument");
 }
 
-static void
-sock_define_const(const char *name, int value, VALUE mConst)
-{
-    rb_define_const(rb_cSocket, name, INT2NUM(value));
-    rb_define_const(mConst, name, INT2NUM(value));
-}
-
-static void
-sock_define_uconst(const char *name, unsigned int value, VALUE mConst)
-{
-    rb_define_const(rb_cSocket, name, UINT2NUM(value));
-    rb_define_const(mConst, name, UINT2NUM(value));
-}
-
 /*
  * Socket::Constants module
  */
 void
 Init_socket_constants(void)
 {
-    VALUE mConst;
-
     /* constants */
-    mConst = rb_define_module_under(rb_cSocket, "Constants");
-    init_constants(mConst);
+    rb_mSockConst = rb_define_module_under(rb_cSocket, "Constants");
+    init_constants();
 }
Index: ext/socket/mkconstants.rb
===================================================================
--- ext/socket/mkconstants.rb	(revision 22360)
+++ ext/socket/mkconstants.rb	(revision 22361)
@@ -51,16 +51,16 @@
 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 @@
 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 @@
 % }
 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 @@
 <%= 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") %>
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/