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

compile.c: static_literal_value

Browse Source 
* compile.c (static_literal_value): separate getter from predicate
  function.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-08 13:51:34 +00:00
parent f573eee225
commit 761653db90
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
compile.c
View File

@ -2961,27 +2961,35 @@ enum compile_array_type_t {
COMPILE_ARRAY_TYPE_ARGS COMPILE_ARRAY_TYPE_ARGS
}; };
static int static inline int
static_literal_node_p(NODE *node, VALUE *val) static_literal_node_p(NODE *node)
{ {
node = node->nd_head; node = node->nd_head;
switch (nd_type(node)) { switch (nd_type(node)) {
case NODE_LIT: case NODE_LIT:
*val = node->nd_lit;
break;
case NODE_NIL: case NODE_NIL:
*val = Qnil;
break;
case NODE_TRUE: case NODE_TRUE:
*val = Qtrue;
break;
case NODE_FALSE: case NODE_FALSE:
*val = Qfalse; return TRUE;
break;
default: default:
return FALSE; return FALSE;
} }
return TRUE; }
static inline VALUE
static_literal_value(NODE *node)
{
node = node->nd_head;
switch (nd_type(node)) {
case NODE_NIL:
return Qnil;
case NODE_TRUE:
return Qtrue;
case NODE_FALSE:
return Qfalse;
default:
return node->nd_lit;
}
} }
static int static int
@ -3008,7 +3016,6 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE* node_root,
while (node) { while (node) {
NODE *start_node = node, *end_node; NODE *start_node = node, *end_node;
NODE *kw = 0; NODE *kw = 0;
VALUE elem[2];
const int max = 0x100; const int max = 0x100;
DECL_ANCHOR(anchor); DECL_ANCHOR(anchor);
INIT_ANCHOR(anchor); INIT_ANCHOR(anchor);
@ -3028,7 +3035,7 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE* node_root,
} }
break; break;
} }
if (opt_p && !static_literal_node_p(node, elem)) { if (opt_p && !static_literal_node_p(node)) {
opt_p = 0; opt_p = 0;
} }
@ -3048,13 +3055,15 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE* node_root,
node = start_node; node = start_node;
while (node != end_node) { while (node != end_node) {
static_literal_node_p(node, elem); rb_ary_push(ary, static_literal_value(node));
rb_ary_push(ary, elem[0]);
node = node->nd_next; node = node->nd_next;
} }
while (node && node->nd_next && while (node && node->nd_next &&
static_literal_node_p(node, &elem[0]) && static_literal_node_p(node) &&
static_literal_node_p(node->nd_next, &elem[1])) { static_literal_node_p(node->nd_next)) {
VALUE elem[2];
elem[0] = static_literal_value(node);
elem[1] = static_literal_value(node->nd_next);
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++;