nobu	2008-02-22 09:07:23 +0900 (Fri, 22 Feb 2008)

  New Revision: 15567

  Modified files:
    trunk/enc/depend
    trunk/enc/make_encdb.rb
    trunk/enc/trans/make_transdb.rb
    trunk/version.h

  Log:
    * enc/{depend,make_encdb.rb,trans/make_transdb.rb}: sort in alpha-numeric order.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/make_encdb.rb?r1=15567&r2=15566&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15567&r2=15566&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/trans/make_transdb.rb?r1=15567&r2=15566&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/depend?r1=15567&r2=15566&diff_format=u

Index: enc/trans/make_transdb.rb
===================================================================
--- enc/trans/make_transdb.rb	(revision 15566)
+++ enc/trans/make_transdb.rb	(revision 15567)
@@ -10,7 +10,9 @@
 converters = {}
 transdir = ARGV[0]
 outhdr = ARGV[1] || 'transdb.h'
-Dir.open(transdir) {|d| d.grep(/.+\.[ch]\z/)}.sort.each do |fn|
+Dir.open(transdir) {|d| d.grep(/.+\.[ch]\z/)}.sort_by {|e|
+  e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten
+}.each do |fn|
   open(File.join(transdir,fn)) do |f|
     f.each_line do |line|
       if (/^static const rb_transcoder/ =~ line)..(/"(.*?)"\s*,\s*"(.*?)"/ =~ line)
Index: enc/depend
===================================================================
--- enc/depend	(revision 15566)
+++ enc/depend	(revision 15567)
@@ -1,7 +1,7 @@
 % deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"])
 % encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS
 % encs.each {|e| e.chomp!(".c")}
-% alphanumeric_order = proc {|e| e.split(/(\d+)/).map {|n| Integer(n) rescue n}}
+% alphanumeric_order = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten}
 % encs = encs.sort_by(&alphanumeric_order)
 % trans = Dir.open($srcdir+"/trans") {|d| d.select {|e| e.chomp!('.c')}}
 % trans = trans.sort_by(&alphanumeric_order)
Index: enc/make_encdb.rb
===================================================================
--- enc/make_encdb.rb	(revision 15566)
+++ enc/make_encdb.rb	(revision 15567)
@@ -24,7 +24,9 @@
 defs = {}
 encdir = ARGV[0]
 outhdr = ARGV[1] || 'encdb.h'
-Dir.open(encdir) {|d| d.grep(/.+\.[ch]\z/)}.sort.each do |fn|
+Dir.open(encdir) {|d| d.grep(/.+\.[ch]\z/)}.sort_by {|e|
+  e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten
+}.each do |fn|
   open(File.join(encdir,fn)) do |f|
     orig = nil
     name = nil
Index: version.h
===================================================================
--- version.h	(revision 15566)
+++ version.h	(revision 15567)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-02-20"
+#define RUBY_RELEASE_DATE "2008-02-22"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080220
+#define RUBY_RELEASE_CODE 20080222
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 22
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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