1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby.c: extra comma

Browse Source 
* ruby.c (feature_option, debug_option, dump_option): remove an
  extra comma from option lists.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-03-08 15:21:22 +00:00
parent 7196266b9a
commit 7b7c7b339c
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ruby.c
View File

@ -63,45 +63,57 @@ char *getenv();
#define DEFAULT_RUBYGEMS_ENABLED "enabled" #define DEFAULT_RUBYGEMS_ENABLED "enabled"
#endif #endif
#define COMMA ,
#define FEATURE_BIT(bit) (1U << feature_##bit) #define FEATURE_BIT(bit) (1U << feature_##bit)
#define EACH_FEATURES(X) \ #define EACH_FEATURES(X, SEP) \
X(gems) \ X(gems) \
SEP \
X(did_you_mean) \ X(did_you_mean) \
SEP \
X(rubyopt) \ X(rubyopt) \
SEP \
X(frozen_string_literal) \ X(frozen_string_literal) \
/* END OF FEATURES */ /* END OF FEATURES */
#define EACH_DEBUG_FEATURES(X) \ #define EACH_DEBUG_FEATURES(X, SEP) \
X(frozen_string_literal) \ X(frozen_string_literal) \
/* END OF DEBUG FEATURES */ /* END OF DEBUG FEATURES */
#define AMBIGUOUS_FEATURE_NAMES 0 /* no ambiguous feature names now */ #define AMBIGUOUS_FEATURE_NAMES 0 /* no ambiguous feature names now */
#define DEFINE_FEATURE(bit) feature_##bit, #define DEFINE_FEATURE(bit) feature_##bit
#define DEFINE_DEBUG_FEATURE(bit) feature_debug_##bit, #define DEFINE_DEBUG_FEATURE(bit) feature_debug_##bit
enum feature_flag_bits { enum feature_flag_bits {
EACH_FEATURES(DEFINE_FEATURE) EACH_FEATURES(DEFINE_FEATURE, COMMA),
feature_debug_flag_first, feature_debug_flag_first,
feature_debug_flag_begin = feature_debug_flag_first - 1, feature_debug_flag_begin = feature_debug_flag_first - 1,
EACH_DEBUG_FEATURES(DEFINE_DEBUG_FEATURE) EACH_DEBUG_FEATURES(DEFINE_DEBUG_FEATURE, COMMA),
feature_flag_count feature_flag_count
}; };
#define DEBUG_BIT(bit) (1U << feature_debug_##bit) #define DEBUG_BIT(bit) (1U << feature_debug_##bit)
#define DUMP_BIT(bit) (1U << dump_##bit) #define DUMP_BIT(bit) (1U << dump_##bit)
#define DEFINE_DUMP(bit) dump_##bit, #define DEFINE_DUMP(bit) dump_##bit
#define EACH_DUMPS(X) \ #define EACH_DUMPS(X, SEP) \
X(version) \ X(version) \
SEP \
X(copyright) \ X(copyright) \
SEP \
X(usage) \ X(usage) \
SEP \
X(help) \ X(help) \
SEP \
X(yydebug) \ X(yydebug) \
SEP \
X(syntax) \ X(syntax) \
SEP \
X(parsetree) \ X(parsetree) \
SEP \
X(parsetree_with_comment) \ X(parsetree_with_comment) \
SEP \
X(insns) \ X(insns) \
/* END OF DUMPS */ /* END OF DUMPS */
enum dump_flag_bits { enum dump_flag_bits {
dump_version_v, dump_version_v,
EACH_DUMPS(DEFINE_DUMP) EACH_DUMPS(DEFINE_DUMP, COMMA),
dump_flag_count dump_flag_count
}; };
@ -761,12 +773,12 @@ name_match_p(const char *name, const char *str, size_t len)
return; \ return; \
} }
#define LITERAL_NAME_ELEMENT(name) #name", " #define LITERAL_NAME_ELEMENT(name) #name
static void static void
feature_option(const char *str, int len, void *arg, const unsigned int enable) feature_option(const char *str, int len, void *arg, const unsigned int enable)
{ {
static const char list[] = EACH_FEATURES(LITERAL_NAME_ELEMENT); static const char list[] = EACH_FEATURES(LITERAL_NAME_ELEMENT, ", ");
unsigned int *argp = arg; unsigned int *argp = arg;
unsigned int mask = ~0U; unsigned int mask = ~0U;
#if AMBIGUOUS_FEATURE_NAMES #if AMBIGUOUS_FEATURE_NAMES
@ -778,7 +790,7 @@ feature_option(const char *str, int len, void *arg, const unsigned int enable)
#define SET_FEATURE(bit) \ #define SET_FEATURE(bit) \
if (NAME_MATCH_P(#bit, str, len)) {mask = FEATURE_BIT(bit); goto found;} if (NAME_MATCH_P(#bit, str, len)) {mask = FEATURE_BIT(bit); goto found;}
#endif #endif
EACH_FEATURES(SET_FEATURE); EACH_FEATURES(SET_FEATURE, ;);
if (NAME_MATCH_P("all", str, len)) { if (NAME_MATCH_P("all", str, len)) {
found: found:
*argp = (*argp & ~mask) | (mask & enable); *argp = (*argp & ~mask) | (mask & enable);
@ -793,7 +805,7 @@ feature_option(const char *str, int len, void *arg, const unsigned int enable)
rb_str_cat_cstr(mesg, #bit); \ rb_str_cat_cstr(mesg, #bit); \
if (--matched) rb_str_cat_cstr(mesg, ", "); \ if (--matched) rb_str_cat_cstr(mesg, ", "); \
} }
EACH_FEATURES(ADD_FEATURE_NAME); EACH_FEATURES(ADD_FEATURE_NAME, ;);
rb_str_cat_cstr(mesg, ")"); rb_str_cat_cstr(mesg, ")");
rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, mesg)); rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, mesg));
#undef ADD_FEATURE_NAME #undef ADD_FEATURE_NAME
@ -801,7 +813,7 @@ feature_option(const char *str, int len, void *arg, const unsigned int enable)
#endif #endif
rb_warn("unknown argument for --%s: `%.*s'", rb_warn("unknown argument for --%s: `%.*s'",
enable ? "enable" : "disable", len, str); enable ? "enable" : "disable", len, str);
rb_warn("features are [%.*s].", (int)strlen(list) - 2, list); rb_warn("features are [%.*s].", (int)strlen(list), list);
} }
static void static void
@ -819,21 +831,21 @@ disable_option(const char *str, int len, void *arg)
static void static void
debug_option(const char *str, int len, void *arg) debug_option(const char *str, int len, void *arg)
{ {
static const char list[] = EACH_DEBUG_FEATURES(LITERAL_NAME_ELEMENT); static const char list[] = EACH_DEBUG_FEATURES(LITERAL_NAME_ELEMENT, ", ");
#define SET_WHEN_DEBUG(bit) SET_WHEN(#bit, DEBUG_BIT(bit), str, len) #define SET_WHEN_DEBUG(bit) SET_WHEN(#bit, DEBUG_BIT(bit), str, len)
EACH_DEBUG_FEATURES(SET_WHEN_DEBUG); EACH_DEBUG_FEATURES(SET_WHEN_DEBUG, ;);
rb_warn("unknown argument for --debug: `%.*s'", len, str); rb_warn("unknown argument for --debug: `%.*s'", len, str);
rb_warn("debug features are [%.*s].", (int)strlen(list) - 2, list); rb_warn("debug features are [%.*s].", (int)strlen(list), list);
} }
static void static void
dump_option(const char *str, int len, void *arg) dump_option(const char *str, int len, void *arg)
{ {
static const char list[] = EACH_DUMPS(LITERAL_NAME_ELEMENT); static const char list[] = EACH_DUMPS(LITERAL_NAME_ELEMENT, ", ");
#define SET_WHEN_DUMP(bit) SET_WHEN(#bit, DUMP_BIT(bit), str, len) #define SET_WHEN_DUMP(bit) SET_WHEN(#bit, DUMP_BIT(bit), str, len)
EACH_DUMPS(SET_WHEN_DUMP); EACH_DUMPS(SET_WHEN_DUMP, ;);
rb_warn("don't know how to dump `%.*s',", len, str); rb_warn("don't know how to dump `%.*s',", len, str);
rb_warn("but only [%.*s].", (int)strlen(list) - 2, list); rb_warn("but only [%.*s].", (int)strlen(list), list);
} }
static void static void