nobu	2012-08-09 18:33:49 +0900 (Thu, 09 Aug 2012)

  New Revision: 36667

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

  Log:
    ruby.c: show version only once
    
    * ruby.c (proc_options): show version only once even if -v and
      --verbose are given together.
      http://twitter.com/d6rkaiz/status/233491797085671424

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36666)
+++ ChangeLog	(revision 36667)
@@ -1,3 +1,9 @@
+Thu Aug  9 18:33:46 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (proc_options): show version only once even if -v and
+	  --verbose are given together.
+	  http://twitter.com/d6rkaiz/status/233491797085671424
+
 Thu Aug  9 12:37:22 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* test/openssl/test_config.rb (OpenSSL#test_constants): skip this
Index: ruby.c
===================================================================
--- ruby.c	(revision 36666)
+++ ruby.c	(revision 36667)
@@ -62,6 +62,7 @@
 #define DUMP_BIT(bit) (1U << dump_##bit)
 enum dump_flag_bits {
     dump_version,
+    dump_version_v,
     dump_copyright,
     dump_usage,
     dump_yydebug,
@@ -748,7 +749,7 @@
 		s++;
 		goto reswitch;
 	    }
-	    ruby_show_version();
+	    opt->dump |= DUMP_BIT(version_v);
 	    opt->verbose = 1;
 	  case 'w':
 	    ruby_verbose = Qtrue;
@@ -1271,9 +1272,9 @@
     if (opt->src.enc.name)
 	rb_warning("-K is specified; it is for 1.8 compatibility and may cause odd behavior");
 
-    if (opt->dump & DUMP_BIT(version)) {
+    if (opt->dump & (DUMP_BIT(version) | DUMP_BIT(version_v))) {
 	ruby_show_version();
-	return Qtrue;
+	if (opt->dump & DUMP_BIT(version)) return Qtrue;
     }
     if (opt->dump & DUMP_BIT(copyright)) {
 	ruby_show_copyright();

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