1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* expand tabs.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
svn 2018-12-03 23:53:16 +00:00
parent 3b6321083a
commit a13b1f507b
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compile.c
View File

@ -3857,11 +3857,11 @@ static_literal_node_p(const NODE *node, const rb_iseq_t *iseq)
case NODE_FALSE: case NODE_FALSE:
return TRUE; return TRUE;
case NODE_STR: case NODE_STR:
if (ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) { if (ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
return TRUE; return TRUE;
} else { } else {
return FALSE; return FALSE;
} }
default: default:
return FALSE; return FALSE;
} }
@ -3879,16 +3879,16 @@ static_literal_value(const NODE *node, rb_iseq_t *iseq)
case NODE_FALSE: case NODE_FALSE:
return Qfalse; return Qfalse;
case NODE_STR: case NODE_STR:
if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) { if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
VALUE lit; VALUE lit;
VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX((int)nd_line(node))); VALUE debug_info = rb_ary_new_from_args(2, rb_iseq_path(iseq), INT2FIX((int)nd_line(node)));
lit = rb_str_dup(node->nd_lit); lit = rb_str_dup(node->nd_lit);
rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info)); rb_ivar_set(lit, id_debug_created_info, rb_obj_freeze(debug_info));
return rb_str_freeze(lit); return rb_str_freeze(lit);
} }
else { else {
return rb_fstring(node->nd_lit); return rb_fstring(node->nd_lit);
} }
default: default:
return node->nd_lit; return node->nd_lit;
} }
@ -3938,7 +3938,7 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
} }
break; break;
} }
if (opt_p && !static_literal_node_p(node, iseq)) { if (opt_p && !static_literal_node_p(node, iseq)) {
opt_p = 0; opt_p = 0;
} }
@ -3960,15 +3960,15 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro
node = start_node; node = start_node;
while (node != end_node) { while (node != end_node) {
rb_ary_push(ary, static_literal_value(node, iseq)); rb_ary_push(ary, static_literal_value(node, iseq));
node = node->nd_next; node = node->nd_next;
} }
while (node && node->nd_next && while (node && node->nd_next &&
static_literal_node_p(node, iseq) && static_literal_node_p(node, iseq) &&
static_literal_node_p(node->nd_next, iseq)) { static_literal_node_p(node->nd_next, iseq)) {
VALUE elem[2]; VALUE elem[2];
elem[0] = static_literal_value(node, iseq); elem[0] = static_literal_value(node, iseq);
elem[1] = static_literal_value(node->nd_next, iseq); elem[1] = static_literal_value(node->nd_next, iseq);
rb_ary_cat(ary, elem, 2); rb_ary_cat(ary, elem, 2);
node = node->nd_next->nd_next; node = node->nd_next->nd_next;
len++; len++;