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

[Feature #20293] Add Warning.categories

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-02-22 22:25:12 +09:00
parent f36a71e269
commit 1ad366134d
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
error.c
View File

@ -252,6 +252,26 @@ rb_warning_s_aset(VALUE mod, VALUE category, VALUE flag)
return flag;
}
/*
* call-seq:
* categories -> array
*
* Returns a list of the supported category symbols.
*/
static VALUE
rb_warning_s_categories(VALUE mod)
{
st_index_t num = warning_categories.id2enum->num_entries;
ID *ids = ALLOCA_N(ID, num);
num = st_keys(warning_categories.id2enum, ids, num);
VALUE ary = rb_ary_new_capa(num);
for (st_index_t i = 0; i < num; ++i) {
rb_ary_push(ary, ID2SYM(ids[i]));
}
return rb_ary_freeze(ary);
}
/*
* call-seq:
* warn(msg, category: nil) -> nil
@ -3413,6 +3433,7 @@ Init_Exception(void)
rb_mWarning = rb_define_module("Warning");
rb_define_singleton_method(rb_mWarning, "[]", rb_warning_s_aref, 1);
rb_define_singleton_method(rb_mWarning, "[]=", rb_warning_s_aset, 2);
rb_define_singleton_method(rb_mWarning, "categories", rb_warning_s_categories, 0);
rb_define_method(rb_mWarning, "warn", rb_warning_s_warn, -1);
rb_extend_object(rb_mWarning, rb_mWarning);

3
test/ruby/test_rubyoptions.rb
View File

@ -112,7 +112,8 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err(%w(-We) + ['p $-W'], "", %w(2), [])
assert_in_out_err(%w(-w -W0 -e) + ['p $-W'], "", %w(0), [])
categories = {"deprecated"=>1, "experimental"=>0, "performance"=>2}
categories = {deprecated: 1, experimental: 0, performance: 2}
assert_equal categories.keys.sort, Warning.categories.sort
categories.each do |category, level|
assert_in_out_err(["-W:#{category}", "-e", "p Warning[:#{category}]"], "", %w(true), [])

4
tool/lib/envutil.rb
View File

@ -53,7 +53,9 @@ module EnvUtil
@original_external_encoding = Encoding.default_external
@original_verbose = $VERBOSE
@original_warning =
if defined?(Warning.[]) # 2.7+
if defined?(Warning.categories)
Warning.categories.to_h {|i| [i, Warning[i]]}
elsif defined?(Warning.[]) # 2.7+
%i[deprecated experimental performance].to_h do |i|
[i, begin Warning[i]; rescue ArgumentError; end]
end.compact