From 012368007f0a7fce81a0083c96aa549c21141d05 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 25 Nov 2015 08:02:29 +0000 Subject: iseq.h: rename member * iseq.h (rb_compile_option_struct): rename the member frozen_string_literal_debug as debug_frozen_string_literal. [Feature #11725] * ruby.c (proc_options): do not set $DEBUG and $VERBOSE only if no arguments is given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- iseq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'iseq.c') diff --git a/iseq.c b/iseq.c index b1f05a2d62..cc7110ae14 100644 --- a/iseq.c +++ b/iseq.c @@ -349,7 +349,7 @@ static rb_compile_option_t COMPILE_OPTION_DEFAULT = { OPT_STACK_CACHING, /* int stack_caching; */ OPT_TRACE_INSTRUCTION, /* int trace_instruction */ OPT_FROZEN_STRING_LITERAL, - OPT_FROZEN_STRING_LITERAL_DEBUG + OPT_DEBUG_FROZEN_STRING_LITERAL, }; static const rb_compile_option_t COMPILE_OPTION_FALSE = {0}; @@ -375,7 +375,7 @@ set_compile_option_from_hash(rb_compile_option_t *option, VALUE opt) SET_COMPILE_OPTION(option, opt, stack_caching); SET_COMPILE_OPTION(option, opt, trace_instruction); SET_COMPILE_OPTION(option, opt, frozen_string_literal); - SET_COMPILE_OPTION(option, opt, frozen_string_literal_debug); + SET_COMPILE_OPTION(option, opt, debug_frozen_string_literal); SET_COMPILE_OPTION_NUM(option, opt, debug_level); #undef SET_COMPILE_OPTION #undef SET_COMPILE_OPTION_NUM @@ -429,7 +429,7 @@ make_compile_option_value(rb_compile_option_t *option) SET_COMPILE_OPTION(option, opt, stack_caching); SET_COMPILE_OPTION(option, opt, trace_instruction); SET_COMPILE_OPTION(option, opt, frozen_string_literal); - SET_COMPILE_OPTION(option, opt, frozen_string_literal_debug); + SET_COMPILE_OPTION(option, opt, debug_frozen_string_literal); SET_COMPILE_OPTION_NUM(option, opt, debug_level); } #undef SET_COMPILE_OPTION -- cgit v1.2.3