mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
2e3fc1f064
commit
7505436d62
1 changed files with 8 additions and 4 deletions
12
ruby.c
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue