kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ruby.c (proc_options): checks if the word is empty.

Browse source 
* ruby.c (process_options): typo fixed.  [ruby-dev:34122]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-03-25 07:32:58 +00:00
parent 708e5ddde6
commit f6001be537
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Mar 25 16:32:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org> Tue Mar 25 15:26:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (defined_expr): false short-circuit destination label may * compile.c (defined_expr): false short-circuit destination label may

6
ruby.c
View file

@ -842,14 +842,14 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
} }
else if (strncmp("enable", s, n = 6) == 0 && else if (strncmp("enable", s, n = 6) == 0 &&
(!s[n] || s[n] == '-' || s[n] == '=')) { (!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"); rb_raise(rb_eRuntimeError, "missing argument for --enable");
} }
ruby_each_words(s, enable_option, &opt->disable); ruby_each_words(s, enable_option, &opt->disable);
} }
else if (strncmp("disable", s, n = 7) == 0 && else if (strncmp("disable", s, n = 7) == 0 &&
(!s[n] || s[n] == '-' || s[n] == '=')) { (!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"); rb_raise(rb_eRuntimeError, "missing argument for --disable");
} }
ruby_each_words(s, disable_option, &opt->disable); ruby_each_words(s, disable_option, &opt->disable);
@ -1051,7 +1051,7 @@ process_options(VALUE arg)
process_sflag(opt); process_sflag(opt);
ruby_init_loadpath(); ruby_init_loadpath();
ruby_init_gems(!(opt->disable && DISABLE_BIT(gems))); ruby_init_gems(!(opt->disable & DISABLE_BIT(gems)));
parser = rb_parser_new(); parser = rb_parser_new();
if (opt->yydebug) rb_parser_set_yydebug(parser, Qtrue); if (opt->yydebug) rb_parser_set_yydebug(parser, Qtrue);
if (opt->ext.enc.name != 0) { if (opt->ext.enc.name != 0) {