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

[PRISM] Fix behavior of BlockParameters with only one parameter

Browse Source 
This commit sets the ambiguous param flag if there is only one
parameter on a block node. It also fixes a small bug with a trailing
comma on params.
This commit is contained in:
Jemma Issroff 2023-11-30 12:57:49 -05:00
parent ef466ac931
commit d6584a0201
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
prism_compile.c
View File

@ -991,7 +991,7 @@ pm_setup_args(pm_arguments_node_t *arguments_node, int *flags, struct rb_callinf
PM_COMPILE_NOT_POPPED(splat_node->expression); PM_COMPILE_NOT_POPPED(splat_node->expression);
} }
ADD_INSN1(ret, &dummy_line_node, splatarray, popped ? Qfalse : Qtrue); ADD_INSN1(ret, &dummy_line_node, splatarray, Qfalse);
has_splat = true; has_splat = true;
post_splat_counter = 0; post_splat_counter = 0;
@ -3798,9 +3798,13 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
} }
if (parameters_node && parameters_node->rest) { if (parameters_node && parameters_node->rest) {
body->param.rest_start = arg_size++; // If there's a trailing comma, we'll have an implicit rest node,
body->param.flags.has_rest = true; // and we don't want it to impact the rest variables on param
assert(body->param.rest_start != -1); if (!(PM_NODE_TYPE_P(parameters_node->rest, PM_IMPLICIT_REST_NODE))) {
body->param.rest_start = arg_size++;
body->param.flags.has_rest = true;
assert(body->param.rest_start != -1);
}
} }
if (posts_list && posts_list->size) { if (posts_list && posts_list->size) {
@ -3908,6 +3912,12 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
} }
} }
// If there's only one required element in the parameters
// CRuby needs to recognize it as an ambiguous parameter
if (body->type == ISEQ_TYPE_BLOCK && arg_size == 1 && requireds_list && requireds_list->size == 1) {
body->param.flags.ambiguous_param0 = true;
}
iseq_calc_param_size(iseq); iseq_calc_param_size(iseq);
body->param.size = arg_size; body->param.size = arg_size;

9
test/ruby/test_compile_prism.rb
View File

@ -847,6 +847,15 @@ module Prism
assert_prism_eval("[].tap { _1 }") assert_prism_eval("[].tap { _1 }")
assert_prism_eval("[].each { |a,| }") assert_prism_eval("[].each { |a,| }")
assert_prism_eval("[[]].map { |a| a }")
assert_prism_eval("[[]].map { |a| a }")
assert_prism_eval("[[]].map { |a, &block| a }")
assert_prism_eval("[[]].map { |a, &block| a }")
assert_prism_eval("[{}].map { |a,| }")
assert_prism_eval("[[]].map { |a,b=1| a }")
assert_prism_eval("[{}].map { |a,| }")
assert_prism_eval("[{}].map { |a| a }")
end end
def test_ClassNode def test_ClassNode