Merge pull request #1577 from haldun/haldun/test-predicate-closed-for…

…-elsif Check whether the predicate is closed for conditionals
ruby · Sep 28, 2023 · d93a391 · d93a391
2 parents dd3a2c6 + bf43006
commit d93a391
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/prism.c b/src/prism.c
@@ -9843,12 +9843,10 @@ parse_arguments_list(pm_parser_t *parser, pm_arguments_t *arguments, bool accept
 }
 
 static inline pm_node_t *
-parse_conditional(pm_parser_t *parser, pm_context_t context) {
-    pm_token_t keyword = parser->previous;
-
+parse_predicate(pm_parser_t *parser, pm_binding_power_t binding_power, pm_context_t context) {
     context_push(parser, PM_CONTEXT_PREDICATE);
     pm_diagnostic_id_t error_id = context == PM_CONTEXT_IF ? PM_ERR_CONDITIONAL_IF_PREDICATE : PM_ERR_CONDITIONAL_UNLESS_PREDICATE;
-    pm_node_t *predicate = parse_expression(parser, PM_BINDING_POWER_MODIFIER, error_id);
+    pm_node_t *predicate = parse_expression(parser, binding_power, error_id);
 
     // Predicates are closed by a term, a "then", or a term and then a "then".
     bool predicate_closed = accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
@@ -9858,6 +9856,13 @@ parse_conditional(pm_parser_t *parser, pm_context_t context) {
     }
 
     context_pop(parser);
+    return predicate;
+}
+
+static inline pm_node_t *
+parse_conditional(pm_parser_t *parser, pm_context_t context) {
+    pm_token_t keyword = parser->previous;
+    pm_node_t *predicate = parse_predicate(parser, PM_BINDING_POWER_MODIFIER, context);
     pm_statements_node_t *statements = NULL;
 
     if (!match3(parser, PM_TOKEN_KEYWORD_ELSIF, PM_TOKEN_KEYWORD_ELSE, PM_TOKEN_KEYWORD_END)) {
@@ -9889,12 +9894,7 @@ parse_conditional(pm_parser_t *parser, pm_context_t context) {
     if (context == PM_CONTEXT_IF) {
         while (accept1(parser, PM_TOKEN_KEYWORD_ELSIF)) {
             pm_token_t elsif_keyword = parser->previous;
-            pm_node_t *predicate = parse_expression(parser, PM_BINDING_POWER_MODIFIER, PM_ERR_CONDITIONAL_ELSIF_PREDICATE);
-
-            // Predicates are closed by a term, a "then", or a term and then a "then".
-            accept2(parser, PM_TOKEN_NEWLINE, PM_TOKEN_SEMICOLON);
-            accept1(parser, PM_TOKEN_KEYWORD_THEN);
-
+            pm_node_t *predicate = parse_predicate(parser, PM_BINDING_POWER_MODIFIER, PM_CONTEXT_ELSIF);
             pm_accepts_block_stack_push(parser, true);
             pm_statements_node_t *statements = parse_statements(parser, PM_CONTEXT_ELSIF);
             pm_accepts_block_stack_pop(parser);

diff --git a/test/prism/errors_test.rb b/test/prism/errors_test.rb
@@ -1317,10 +1317,11 @@ def test_numbered_parameters_in_block_arguments
     end
 
     def test_conditional_predicate_closed
-      source = "if 0 0; end\nunless 0 0; end"
+      source = "if 0 0; elsif 0 0; end\nunless 0 0; end"
       assert_errors expression(source), source, [
         ["Expected `then` or `;` or '\n" + "'", 5..6],
-        ["Expected `then` or `;` or '\n" + "'", 21..22],
+        ["Expected `then` or `;` or '\n" + "'", 16..17],
+        ["Expected `then` or `;` or '\n" + "'", 32..33],
       ]
     end