summaryrefslogtreecommitdiff
path: root/error.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-12-08 19:33:43 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-12-08 22:50:45 +0900
commit2749123e213007e20d2f5e65ce941ff53feb4c76 (patch)
tree97cc834735fe97b3c49e5569ed933fefab8d1c94 /error.c
parentd5ffa4e9a43ebdd451fb2c46529d301dec03f666 (diff)
Supported category option in Warning#warn
Diffstat (limited to 'error.c')
-rw-r--r--error.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/error.c b/error.c
index 3929b01623..575c3ebfe0 100644
--- a/error.c
+++ b/error.c
@@ -238,7 +238,7 @@ rb_warning_s_aset(VALUE mod, VALUE category, VALUE flag)
*
* Writes warning message +msg+ to $stderr. This method is called by
* Ruby for all emitted warnings. A +category+ may be included with
- * the warning, but is ignored by default.
+ * the warning.
*
* See the documentation of the Warning module for how to customize this.
*/
@@ -248,13 +248,17 @@ rb_warning_s_warn(int argc, VALUE *argv, VALUE mod)
{
VALUE str;
VALUE opt;
- VALUE category;
+ VALUE category = Qnil;
rb_scan_args(argc, argv, "1:", &str, &opt);
if (!NIL_P(opt)) rb_get_kwargs(opt, &id_category, 0, 1, &category);
Check_Type(str, T_STRING);
rb_must_asciicompat(str);
+ if (!NIL_P(category)) {
+ rb_warning_category_t cat = rb_warning_category_from_name(category);
+ if (!rb_warning_category_enabled_p(cat)) return Qnil;
+ }
rb_write_error_str(str);
return Qnil;
}
@@ -301,7 +305,8 @@ rb_warning_warn(VALUE mod, VALUE str)
static int
-rb_warning_warn_arity(void) {
+rb_warning_warn_arity(void)
+{
return rb_method_entry_arity(rb_method_entry(rb_singleton_class(rb_mWarning), id_warn));
}