kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

Factor a "highlight" symbol out

This commit is contained in:
Yusuke Endoh 2022-02-07 16:05:45 +09:00
parent eda10e8102
commit 25b0577c92
Notes: git 2022-02-22 11:56:14 +09:00 
Merged: https://github.com/ruby/ruby/pull/5516
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
error.c
View File

@ -77,6 +77,7 @@ static ID id_category;
static ID id_deprecated; static ID id_deprecated;
static ID id_experimental; static ID id_experimental;
static VALUE sym_category; static VALUE sym_category;
static VALUE sym_highlight;
static struct { static struct {
st_table *id2enum, *enum2id; st_table *id2enum, *enum2id;
} warning_categories; } warning_categories;
@ -1268,10 +1269,7 @@ check_highlight_keyword(VALUE opt, int auto_tty_detect)
VALUE highlight = Qnil; VALUE highlight = Qnil;
if (!NIL_P(opt)) { if (!NIL_P(opt)) {
static VALUE kw_highlight; highlight = rb_hash_aref(opt, sym_highlight);
if (!kw_highlight) kw_highlight = ID2SYM(rb_intern_const("highlight"));
highlight = rb_hash_aref(opt, kw_highlight);
switch (highlight) { switch (highlight) {
default: default:
@ -1351,10 +1349,8 @@ exc_full_message(int argc, VALUE *argv, VALUE exc)
order = check_order_keyword(opt); order = check_order_keyword(opt);
{ {
static VALUE kw_highlight;
if (!kw_highlight) kw_highlight = ID2SYM(rb_intern_const("highlight"));
if (NIL_P(opt)) opt = rb_hash_new(); if (NIL_P(opt)) opt = rb_hash_new();
rb_hash_aset(opt, kw_highlight, highlight); rb_hash_aset(opt, sym_highlight, highlight);
} }
str = rb_str_new2(""); str = rb_str_new2("");
@ -3076,6 +3072,7 @@ Init_Exception(void)
id_recv = rb_make_internal_id(); id_recv = rb_make_internal_id();
sym_category = ID2SYM(id_category); sym_category = ID2SYM(id_category);
sym_highlight = ID2SYM(rb_intern_const("highlight"));
warning_categories.id2enum = rb_init_identtable(); warning_categories.id2enum = rb_init_identtable();
st_add_direct(warning_categories.id2enum, id_deprecated, RB_WARN_CATEGORY_DEPRECATED); st_add_direct(warning_categories.id2enum, id_deprecated, RB_WARN_CATEGORY_DEPRECATED);