Merge pull request #1791 from makenowjust/fix-1772

Reset do_loop_stack around a body of a endless method definition
ruby · Nov 9, 2023 · 4414ee0 · 4414ee0
2 parents add546d + cdf58e8
commit 4414ee0
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 42 deletions.
diff --git a/src/prism.c b/src/prism.c
@@ -14326,6 +14326,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power) {
                 equal = parser->previous;
 
                 context_push(parser, PM_CONTEXT_DEF);
+                pm_do_loop_stack_push(parser, false);
                 statements = (pm_node_t *) pm_statements_node_create(parser);
 
                 pm_node_t *statement = parse_expression(parser, PM_BINDING_POWER_DEFINED + 1, PM_ERR_DEF_ENDLESS);
@@ -14338,6 +14339,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power) {
                 }
 
                 pm_statements_node_body_append((pm_statements_node_t *) statements, statement);
+                pm_do_loop_stack_pop(parser);
                 context_pop(parser);
                 end_keyword = not_provided(parser);
             } else {

diff --git a/test/prism/fixtures/while.txt b/test/prism/fixtures/while.txt
@@ -17,3 +17,5 @@ while class Foo a = tap do end; end; break; end
 while class << self; tap do end; end; break; end
 
 while class << self; a = tap do end; end; break; end
+
+while def foo = bar do end; end
diff --git a/test/prism/snapshots/while.txt b/test/prism/snapshots/while.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,5 @@ while class Foo a = tap do end; end; break; end
		while class << self; tap do end; end; break; end

		while class << self; a = tap do end; end; break; end

		while def foo = bar do end; end