Skip to content
Browse files

* ruby.c (is_option_with_optarg): macro for optional argument option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 2e3fc1f commit 7505436d62a39abbfb6b0df46adde3260f96d711 @nobu nobu committed Feb 27, 2013
Showing with 8 additions and 4 deletions.
  1. +8 −4 ruby.c
View
12 ruby.c
@@ -1056,13 +1056,16 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
# define check_envopt(name, allow_envopt) \
(((allow_envopt) || !envopt) ? (void)0 : \
rb_raise(rb_eRuntimeError, "invalid switch in RUBYOPT: --" name))
-# define need_argument(name, s) \
- ((*(s)++ ? !*(s) : (!--argc || !((s) = *++argv))) ? \
+# define need_argument(name, s, needs_arg) \
+ ((*(s)++ ? !*(s) : (!--argc || !((s) = *++argv))) && (needs_arg) ? \
rb_raise(rb_eRuntimeError, "missing argument for --" name) \
: (void)0)
-# define is_option_with_arg(name, allow_hyphen, allow_envopt) \
+# define is_option_with_arg(name, allow_hyphen, allow_envopt) \
+ is_option_with_optarg(name, allow_hyphen, allow_envopt, Qtrue)
+# define is_option_with_optarg(name, allow_hyphen, allow_envopt, needs_arg) \
(strncmp((name), s, n = sizeof(name) - 1) == 0 && is_option_end(s[n], (allow_hyphen)) ? \
- (check_envopt(name, (allow_envopt)), s += n, need_argument(name, s), 1) : 0)
+ (check_envopt(name, (allow_envopt)), s += n, \
+ need_argument(name, s, needs_arg), 1) : 0)
if (strcmp("copyright", s) == 0) {
if (envopt) goto noenvopt_long;
@@ -1174,6 +1177,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
# undef check_envopt
# undef need_argument
# undef is_option_with_arg
+# undef is_option_with_optarg
}
}

0 comments on commit 7505436

Please sign in to comment.
Something went wrong with that request. Please try again.