[前][次][番号順一覧][スレッド一覧]

ruby-changes:59232

From: Nobuyoshi <ko1@a...>
Date: Fri, 13 Dec 2019 20:47:30 +0900 (JST)
Subject: [ruby-changes:59232] 6183addf6a (master): Add `Warning.[]` and `Warning.[]=`

https://git.ruby-lang.org/ruby.git/commit/?id=6183addf6a

From 6183addf6a4b94db7fe5b9187ac66fa11c8d2825 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 12 Nov 2019 18:34:49 +0900
Subject: Add `Warning.[]` and `Warning.[]=`


diff --git a/error.c b/error.c
index b2f6565..a61c023 100644
--- a/error.c
+++ b/error.c
@@ -128,6 +128,50 @@ rb_syntax_error_append(VALUE exc, VALUE file, int line, int column, https://github.com/ruby/ruby/blob/trunk/error.c#L128
     return exc;
 }
 
+static unsigned int warning_disabled_categories;
+#define RB_WARN_CATEGORY_DEPRECATED 1
+
+static unsigned int
+rb_warning_category_mask(VALUE category)
+{
+    unsigned int mask = 0;
+    Check_Type(category, T_SYMBOL);
+    if (category == ID2SYM(rb_intern("deprecated"))) {
+        mask = RB_WARN_CATEGORY_DEPRECATED;
+    }
+    else {
+        rb_raise(rb_eArgError, "unknown category: %"PRIsVALUE, category);
+    }
+    return mask;
+}
+
+static int
+rb_warning_category_enabled_p(VALUE category)
+{
+    return !(warning_disabled_categories & rb_warning_category_mask(category));
+}
+
+static VALUE
+rb_warning_s_aref(VALUE mod, VALUE category)
+{
+    if (rb_warning_category_enabled_p(category))
+        return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+rb_warning_s_aset(VALUE mod, VALUE category, VALUE flag)
+{
+    unsigned int mask = rb_warning_category_mask(category);
+    unsigned int disabled = warning_disabled_categories;
+    if (!RTEST(flag))
+        disabled |= mask;
+    else
+        disabled &= ~mask;
+    warning_disabled_categories = disabled;
+    return flag;
+}
+
 /*
  * call-seq:
  *    warn(msg)  -> nil
@@ -2501,6 +2545,8 @@ Init_Exception(void) https://github.com/ruby/ruby/blob/trunk/error.c#L2545
     rb_mErrno = rb_define_module("Errno");
 
     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_method(rb_mWarning, "warn", rb_warning_s_warn, 1);
     rb_extend_object(rb_mWarning, rb_mWarning);
 
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb
index 05cc109..56cd19d 100644
--- a/test/ruby/test_exception.rb
+++ b/test/ruby/test_exception.rb
@@ -1259,6 +1259,12 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status| https://github.com/ruby/ruby/blob/trunk/test/ruby/test_exception.rb#L1259
     };
   end
 
+  def test_warning_category
+    assert_raise(TypeError) {Warning[nil]}
+    assert_raise(ArgumentError) {Warning[:XXXX]}
+    assert_include([true, false], Warning[:deprecated])
+  end
+
   def test_undefined_backtrace
     assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}")
     begin;
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]