nobu	2010-06-25 05:49:37 +0900 (Fri, 25 Jun 2010)

  New Revision: 28425

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

  Log:
    * lib/un.rb (setup): fix of word splitting.  [ruby-dev:41723]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/un.rb
    branches/ruby_1_9_2/version.h
    trunk/ChangeLog
    trunk/lib/un.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28424)
+++ ChangeLog	(revision 28425)
@@ -1,3 +1,7 @@
+Fri Jun 25 05:49:14 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/un.rb (setup): fix of word splitting.  [ruby-dev:41723]
+
 Fri Jun 25 01:07:17 2010  Masaya Tarui  <tarui@r...>
 
 	* include/ruby/ruby.h (static inline rb_gc_guarded_ptr): prevent
Index: lib/un.rb
===================================================================
--- lib/un.rb	(revision 28424)
+++ lib/un.rb	(revision 28425)
@@ -43,8 +43,11 @@
       end
     end
     long_options.each do |s|
-      opt_name = s[/\A(?:--)?([^\s=]+)/, 1].intern
-      o.on(s.gsub(/([a-z])([A-Z])/){$1+"-"+$2.downcase}.sub(/\A(?!--)/, '--')) do |val|
+      opt_name, arg_name = s.split(/(?=[\s=])/, 2)
+      opt_name.sub!(/\A--/, '')
+      s = "--#{opt_name.gsub(/([A-Za-z]+)([A-Z])/, '\1-\2').downcase}#{arg_name}"
+      opt_name = opt_name.intern
+      o.on(s) do |val|
         opt_hash[opt_name] = val
       end
     end
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28424)
+++ ruby_1_9_2/ChangeLog	(revision 28425)
@@ -1,3 +1,7 @@
+Fri Jun 25 05:49:14 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/un.rb (setup): fix of word splitting.  [ruby-dev:41723]
+
 Wed Jun 16 01:38:40 2010  Yusuke Endoh  <mame@t...>
 
 	* ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
Index: ruby_1_9_2/lib/un.rb
===================================================================
--- ruby_1_9_2/lib/un.rb	(revision 28424)
+++ ruby_1_9_2/lib/un.rb	(revision 28425)
@@ -43,8 +43,11 @@
       end
     end
     long_options.each do |s|
-      opt_name = s[/\A(?:--)?([^\s=]+)/, 1].intern
-      o.on(s.gsub(/([a-z])([A-Z])/){$1+"-"+$2.downcase}.sub(/\A(?!--)/, '--')) do |val|
+      opt_name, arg_name = s.split(/(?=[\s=])/, 2)
+      opt_name.sub!(/\A--/, '')
+      s = "--#{opt_name.gsub(/([A-Za-z]+)([A-Z])/, '\1-\2').downcase}#{arg_name}"
+      opt_name = opt_name.intern
+      o.on(s) do |val|
         opt_hash[opt_name] = val
       end
     end
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 28424)
+++ ruby_1_9_2/version.h	(revision 28425)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2010-06-24"
+#define RUBY_RELEASE_DATE "2010-06-25"
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -7,7 +7,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 

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