nobu	2008-03-25 16:32:58 +0900 (Tue, 25 Mar 2008)

  New Revision: 15837

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

  Log:
    * ruby.c (proc_options): checks if the word is empty.
    
    * ruby.c (process_options): typo fixed.  [ruby-dev:34122]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ruby.c?r1=15837&r2=15836&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15837&r2=15836&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15836)
+++ ChangeLog	(revision 15837)
@@ -1,3 +1,9 @@
+Tue Mar 25 16:32:56 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (proc_options): checks if the word is empty.
+
+	* ruby.c (process_options): typo fixed.  [ruby-dev:34122]
+
 Tue Mar 25 15:26:30 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (defined_expr): false short-circuit destination label may
Index: ruby.c
===================================================================
--- ruby.c	(revision 15836)
+++ ruby.c	(revision 15837)
@@ -842,14 +842,14 @@
             }
 	    else if (strncmp("enable", s, n = 6) == 0 &&
 		     (!s[n] || s[n] == '-' || s[n] == '=')) {
-		if (!(s += n + 1)[-1] && (!--argc || !(s = *++argv))) {
+		if ((s += n + 1)[-1] ? !*s : (!--argc || !(s = *++argv))) {
 		    rb_raise(rb_eRuntimeError, "missing argument for --enable");
 		}
 		ruby_each_words(s, enable_option, &opt->disable);
 	    }
 	    else if (strncmp("disable", s, n = 7) == 0 &&
 		     (!s[n] || s[n] == '-' || s[n] == '=')) {
-		if (!(s += n + 1)[-1] && (!--argc || !(s = *++argv))) {
+		if ((s += n + 1)[-1] ? !*s : (!--argc || !(s = *++argv))) {
 		    rb_raise(rb_eRuntimeError, "missing argument for --disable");
 		}
 		ruby_each_words(s, disable_option, &opt->disable);
@@ -1051,7 +1051,7 @@
     process_sflag(opt);
 
     ruby_init_loadpath();
-    ruby_init_gems(!(opt->disable && DISABLE_BIT(gems)));
+    ruby_init_gems(!(opt->disable & DISABLE_BIT(gems)));
     parser = rb_parser_new();
     if (opt->yydebug) rb_parser_set_yydebug(parser, Qtrue);
     if (opt->ext.enc.name != 0) {

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