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

Handle defined? with call chains with blocks

Browse Source 
Ensures we can handle expressions like `defined?(a {}.b)`.
This commit is contained in:
Kevin Newton 2024-12-26 16:24:26 -05:00
parent 11c9e4f1ce
commit c859e15875
Notes: git 2024-12-26 22:35:17 +00:00 
Merged: https://github.com/ruby/ruby/pull/12475
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
prism_compile.c
View File

@ -3994,9 +3994,11 @@ pm_compile_defined_expr0(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_l
return;
}
case PM_CALL_NODE: {
#define BLOCK_P(cast) ((cast)->block != NULL && PM_NODE_TYPE_P((cast)->block, PM_BLOCK_NODE))
const pm_call_node_t *cast = ((const pm_call_node_t *) node);
if (cast->block != NULL && PM_NODE_TYPE_P(cast->block, PM_BLOCK_NODE)) {
if (BLOCK_P(cast)) {
dtype = DEFINED_EXPR;
break;
}
@ -4016,7 +4018,7 @@ pm_compile_defined_expr0(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_l
if (cast->receiver) {
pm_compile_defined_expr0(iseq, cast->receiver, node_location, ret, popped, scope_node, true, lfinish, true);
if (PM_NODE_TYPE_P(cast->receiver, PM_CALL_NODE)) {
if (PM_NODE_TYPE_P(cast->receiver, PM_CALL_NODE) && !BLOCK_P((const pm_call_node_t *) cast->receiver)) {
PUSH_INSNL(ret, location, branchunless, lfinish[2]);
const pm_call_node_t *receiver = (const pm_call_node_t *) cast->receiver;
@ -4038,6 +4040,8 @@ pm_compile_defined_expr0(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_l
}
return;
#undef BLOCK_P
}
case PM_YIELD_NODE:
PUSH_INSN(ret, location, putnil);

3
test/ruby/test_compile_prism.rb
View File

@ -207,6 +207,9 @@ module Prism
assert_prism_eval("defined?(a(itself))")
assert_prism_eval("defined?(itself(itself))")
# method chain with a block on the inside
assert_prism_eval("defined?(itself { 1 }.itself)")
# Method chain on a constant
assert_prism_eval(<<~RUBY)
class PrismDefinedNode