nobu	2008-01-13 18:41:50 +0900 (Sun, 13 Jan 2008)

  New Revision: 15023

  Modified files:
    trunk/ChangeLog
    trunk/enc/make_encdb.rb
    trunk/encoding.c

  Log:
    * encoding.c (Init_Encoding): moved initialization from encdb.h.
    
    * enc/make_encdb.rb (enc_name_list): constified.
    
    * enc/make_encdb.rb (enc_init_db): moved some functions to encoding.c.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/make_encdb.rb?r1=15023&r2=15022&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15023&r2=15022&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15023&r2=15022&diff_format=u

Index: encoding.c
===================================================================
--- encoding.c	(revision 15022)
+++ encoding.c	(revision 15023)
@@ -34,6 +34,12 @@
     st_table *alias_name;
 } enc_table;
 
+#undef ENC_REPLICATE
+#undef ENC_ALIAS
+#define ENC_REPLICATE(name, orig) st_insert(enc_table.replica_name, (st_data_t)(name), (st_data_t)(orig))
+#define ENC_ALIAS(name, orig) st_insert(enc_table.alias_name, (st_data_t)(name), (st_data_t)(orig))
+#define enc_name_list_size (sizeof(enc_name_list)/sizeof(enc_name_list[0]))
+
 #include "encdb.h"
 
 #define ENC_UNINITIALIZED (&rb_cEncoding)
@@ -1033,6 +1039,9 @@
 {
     id_base_encoding = rb_intern("#base_encoding");
 
+    enc_table.replica_name = st_init_strcasetable();
+    enc_table.alias_name = st_init_strcasetable();
+
     rb_cEncoding = rb_define_class("Encoding", rb_cObject);
     rb_undef_alloc_func(rb_cEncoding);
     rb_define_method(rb_cEncoding, "to_s", enc_name, 0);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15022)
+++ ChangeLog	(revision 15023)
@@ -1,3 +1,11 @@
+Sun Jan 13 18:41:48 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (Init_Encoding): moved initialization from encdb.h.
+
+	* enc/make_encdb.rb (enc_name_list): constified.
+
+	* enc/make_encdb.rb (enc_init_db): moved some functions to encoding.c.
+
 Sun Jan 13 13:53:00 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (load_file): local variable was not initialized when -x flag
Index: enc/make_encdb.rb
===================================================================
--- enc/make_encdb.rb	(revision 15022)
+++ enc/make_encdb.rb	(revision 15023)
@@ -35,26 +35,16 @@
 end
 p aliases
 open('encdb.h', 'wb') do |f|
-  f.puts 'static const char *enc_name_list[] = {'
+  f.puts 'static const char *const enc_name_list[] = {'
   encodings.each {|name| f.puts'    "%s",' % name}
   replicas.each_key {|name| f.puts'    "%s",' % name}
   aliases.each_key {|name| f.puts'    "%s",' % name}
-  f.puts(<<"_TEXT_")
-};
-#define enc_name_list_size (sizeof(enc_name_list)/sizeof(enc_name_list[0]))
-
-static void enc_init_db(void)
-{
-    if (!enc_table.replica_name) {
-	enc_table.replica_name = st_init_strcasetable();
-    }
-    if (!enc_table.alias_name) {
-	enc_table.alias_name = st_init_strcasetable();
-    }
-_TEXT_
+  f.puts('};', '', 'static void', 'enc_init_db(void)', '{')
   replicas.each_pair {|name, orig|
-    f.puts'    st_insert(enc_table.replica_name, (st_data_t)"%s", (st_data_t)"%s");' % [name, orig]}
+    f.puts '    ENC_REPLICATE("%s", "%s");' % [name, orig]
+  }
   aliases.each_pair {|name, orig|
-    f.puts'    st_insert(enc_table.alias_name, (st_data_t)"%s", (st_data_t)"%s");' % [name, orig]}
+    f.puts '    ENC_ALIAS("%s", "%s");' % [name, orig]
+  }
   f.puts '}'
 end

--
ML: ruby-changes@q...
Info: