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

Not to rewrite node while compiling

Browse Source 
Moved this hack mark to an argument to `compile_hash`.
> Bad Hack: temporarily mark hash node with flag so
> compile_hash can compile call differently.
This commit is contained in:
Nobuyoshi Nakada 2020-06-27 00:47:36 +09:00
parent ad1ebefefe
commit 61984d4760
Notes: git 2020-06-27 10:55:52 +09:00 
Merged: https://github.com/ruby/ruby/pull/3262
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compile.c
View File

@ -490,6 +490,7 @@ static int iseq_set_exception_table(rb_iseq_t *iseq);
static int iseq_set_optargs_table(rb_iseq_t *iseq); static int iseq_set_optargs_table(rb_iseq_t *iseq);
static int compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr); static int compile_defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, VALUE needstr);
static int compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int method_call_keywords, int popped);
/* /*
* To make Array to LinkedList, use link_anchor * To make Array to LinkedList, use link_anchor
@ -4050,12 +4051,7 @@ compile_args(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node,
len--; len--;
} }
else { else {
/* Bad Hack: temporarily mark hash node with flag so compile_hash compile_hash(iseq, ret, node->nd_head, TRUE, FALSE);
* can compile call differently.
*/
node->nd_head->nd_brace = METHOD_CALL_KEYWORDS;
NO_CHECK(COMPILE_(ret, "array element", node->nd_head, FALSE));
node->nd_head->nd_brace = HASH_NO_BRACE;
} }
} }
else { else {
@ -4246,10 +4242,9 @@ static_literal_node_pair_p(const NODE *node, const rb_iseq_t *iseq)
} }
static int static int
compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped) compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int method_call_keywords, int popped)
{ {
int line = (int)nd_line(node); int line = (int)nd_line(node);
int method_call_keywords = node->nd_brace == METHOD_CALL_KEYWORDS;
node = node->nd_head; node = node->nd_head;
@ -8122,7 +8117,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
break; break;
} }
case NODE_HASH: case NODE_HASH:
CHECK(compile_hash(iseq, ret, node, popped) >= 0); CHECK(compile_hash(iseq, ret, node, FALSE, popped) >= 0);
break; break;
case NODE_RETURN: case NODE_RETURN:
CHECK(compile_return(iseq, ret, node, popped)); CHECK(compile_return(iseq, ret, node, popped));