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 (enable_option, disable_option): allow all for all known

Browse source 
features.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-02-23 21:49:15 +00:00
parent 552badf29f
commit b676e2671e
2 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,9 +1,12 @@
Sun Feb 24 06:13:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sun Feb 24 06:49:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* debug.c (ruby_set_debug_option): separated ruby_each_words().
* util.c (ruby_each_words): extracted from ruby_set_debug_option().
* ruby.c (enable_option, disable_option): allow all for all known
features.
* ruby.c (proc_options): generalized enable/disable options.
* ruby.c (ruby_init_gems): take enabled flag. [ruby-core:14840]

41
ruby.c
View file

@ -79,7 +79,7 @@ struct cmdline_options {
int usage;
int version;
int copyright;
int disable;
unsigned int disable;
int verbose;
int yydebug;
char *script;
@ -139,7 +139,7 @@ usage(const char *name)
"-W[level] set warning level; 0=silence, 1=medium, 2=verbose (default)",
"-x[directory] strip off text before #!ruby line and perhaps cd to directory",
"--enable/--disable-FEATURE --enable/--disable=FEATURE enable/disable FEATUREs",
" gems: gem libraries, rubyopt: RUBYOPT env",
" gems: gem libraries, rubyopt: RUBYOPT env, or all",
"--copyright print the copyright",
"--version print the version",
NULL
@ -543,31 +543,44 @@ moreswitches(const char *s, struct cmdline_options *opt)
return (char *)s;
}
#define UNSET_WHEN(bit) \
if (len < sizeof(#bit) && strncmp(str, #bit, len) == 0) { \
*(unsigned int *)arg &= ~DISABLE_BIT(bit); \
return; \
#define NAME_MATCH_P(name, str, len) \
((len) < sizeof(name) && strncmp((str), name, (len)) == 0)
#define UNSET_WHEN(name, bit, str, len) \
if (NAME_MATCH_P(name, str, len)) { \
*(unsigned int *)arg &= ~(bit); \
return; \
}
#define SET_WHEN(bit) \
if (len < sizeof(#bit) && strncmp(str, #bit, len) == 0) { \
*(unsigned int *)arg |= DISABLE_BIT(bit); \
return; \
#define SET_WHEN(name, bit, str, len) \
if (NAME_MATCH_P(name, str, len)) { \
*(unsigned int *)arg |= (bit); \
return; \
}
static void
enable_option(const char *str, int len, void *arg)
{
UNSET_WHEN(gems);
UNSET_WHEN(rubyopt);
#define UNSET_WHEN_DISABLE(bit) UNSET_WHEN(#bit, DISABLE_BIT(bit), str, len)
UNSET_WHEN_DISABLE(gems);
UNSET_WHEN_DISABLE(rubyopt);
if (NAME_MATCH_P("all", str, len)) {
*(unsigned int *)arg = 0U;
return;
}
rb_warn("unknown argument for --enable: `%.*s'", len, str);
}
static void
disable_option(const char *str, int len, void *arg)
{
SET_WHEN(gems);
SET_WHEN(rubyopt);
#define SET_WHEN_DISABLE(bit) SET_WHEN(#bit, DISABLE_BIT(bit), str, len)
SET_WHEN_DISABLE(gems);
SET_WHEN_DISABLE(rubyopt);
if (NAME_MATCH_P("all", str, len)) {
*(unsigned int *)arg = ~0U;
return;
}
rb_warn("unknown argument for --disable: `%.*s'", len, str);
}