1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

No fallback to default values

This commit is contained in:
Nobuyoshi Nakada 2022-05-21 22:58:45 +09:00
parent 6ba394ce30
commit 7e52533104
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6

View file

@ -1269,13 +1269,12 @@ check_highlight_keyword(VALUE opt, int auto_tty_detect)
VALUE highlight = Qnil; VALUE highlight = Qnil;
if (!NIL_P(opt)) { if (!NIL_P(opt)) {
highlight = rb_hash_aref(opt, sym_highlight); highlight = rb_hash_lookup(opt, sym_highlight);
switch (highlight) { switch (highlight) {
default: default:
rb_bool_expected(highlight, "highlight"); rb_bool_expected(highlight, "highlight");
UNREACHABLE; UNREACHABLE;
case Qundef: highlight = Qnil; break;
case Qtrue: case Qfalse: case Qnil: break; case Qtrue: case Qfalse: case Qnil: break;
} }
} }
@ -1301,7 +1300,7 @@ check_order_keyword(VALUE opt)
static VALUE kw_order; static VALUE kw_order;
if (!kw_order) kw_order = ID2SYM(rb_intern_const("order")); if (!kw_order) kw_order = ID2SYM(rb_intern_const("order"));
order = rb_hash_aref(opt, kw_order); order = rb_hash_lookup(opt, kw_order);
if (order != Qnil) { if (order != Qnil) {
ID id = rb_check_id(&order); ID id = rb_check_id(&order);