* ruby.c (ADD_FEATURE_NAME): rename ADD_FEATURE, as it does not
  add a feature, but just append a name to the message string.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-02-09 05:47:12 +00:00
Родитель 70d040ddbd
Коммит 4859eba88f
1 изменённых файлов: 3 добавлений и 2 удалений

5
ruby.c
Просмотреть файл

@ -776,14 +776,15 @@ feature_option(const char *str, int len, void *arg, const unsigned int enable)
if (matched == 1) goto found;
if (matched > 1) {
VALUE mesg = rb_sprintf("ambiguous feature: `%.*s' (", len, str);
#define ADD_FEATURE(bit) \
#define ADD_FEATURE_NAME(bit) \
if (FEATURE_BIT(bit) & set) { \
rb_str_cat_cstr(mesg, #bit); \
if (--matched) rb_str_cat_cstr(mesg, ", "); \
}
EACH_FEATURES(ADD_FEATURE);
EACH_FEATURES(ADD_FEATURE_NAME);
rb_str_cat_cstr(mesg, ")");
rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, mesg));
#undef ADD_FEATURE_NAME
}
#endif
rb_warn("unknown argument for --%s: `%.*s'",