Revert "merge revision(s) 052794b: [Backport #21197]"

This reverts commit e630a0f.

Author: k0kubun

lib/prism/translation/parser/compiler.rb

@@ -664,37 +664,13 @@ def visit_def_node(node)
         # defined?(a)
         # ^^^^^^^^^^^
         def visit_defined_node(node)
-          # Very weird circumstances here where something like:
-          #
-          #     defined?
-          #     (1)
-          #
-          # gets parsed in Ruby as having only the `1` expression but in parser
-          # it gets parsed as having a begin. In this case we need to synthesize
-          # that begin to match parser's behavior.
-          if node.lparen_loc && node.keyword_loc.join(node.lparen_loc).slice.include?("\n")
-            builder.keyword_cmd(
-              :defined?,
-              token(node.keyword_loc),
-              nil,
-              [
-                builder.begin(
-                  token(node.lparen_loc),
-                  visit(node.value),
-                  token(node.rparen_loc)
-                )
-              ],
-              nil
-            )
-          else
-            builder.keyword_cmd(
-              :defined?,
-              token(node.keyword_loc),
-              token(node.lparen_loc),
-              [visit(node.value)],
-              token(node.rparen_loc)
-            )
-          end
+          builder.keyword_cmd(
+            :defined?,
+            token(node.keyword_loc),
+            token(node.lparen_loc),
+            [visit(node.value)],
+            token(node.rparen_loc)
+          )
         end
 
         # if foo then bar else baz end

lib/prism/translation/ripper.rb

@@ -1615,23 +1615,8 @@ def visit_def_node(node)
       # defined?(a)
       # ^^^^^^^^^^^
       def visit_defined_node(node)
-        expression = visit(node.value)
-
-        # Very weird circumstances here where something like:
-        #
-        #     defined?
-        #     (1)
-        #
-        # gets parsed in Ruby as having only the `1` expression but in Ripper it
-        # gets parsed as having a parentheses node. In this case we need to
-        # synthesize that node to match Ripper's behavior.
-        if node.lparen_loc && node.keyword_loc.join(node.lparen_loc).slice.include?("\n")
-          bounds(node.lparen_loc.join(node.rparen_loc))
-          expression = on_paren(on_stmts_add(on_stmts_new, expression))
-        end
-
         bounds(node.location)
-        on_defined(expression)
+        on_defined(visit(node.value))
       end
 
       # if foo then bar else baz end

prism/prism.c

@@ -19557,27 +19557,18 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, b
             pm_token_t lparen;
             pm_token_t rparen;
             pm_node_t *expression;
-
             context_push(parser, PM_CONTEXT_DEFINED);
-            bool newline = accept1(parser, PM_TOKEN_NEWLINE);
 
             if (accept1(parser, PM_TOKEN_PARENTHESIS_LEFT)) {
                 lparen = parser->previous;
+                expression = parse_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_DEFINED_EXPRESSION, (uint16_t) (depth + 1));
 
-                if (newline && accept1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
-                    expression = (pm_node_t *) pm_parentheses_node_create(parser, &lparen, NULL, &parser->previous, 0);
-                    lparen = not_provided(parser);
+                if (parser->recovering) {
                     rparen = not_provided(parser);
                 } else {
-                    expression = parse_expression(parser, PM_BINDING_POWER_COMPOSITION, true, false, PM_ERR_DEFINED_EXPRESSION, (uint16_t) (depth + 1));
-
-                    if (parser->recovering) {
-                        rparen = not_provided(parser);
-                    } else {
-                        accept1(parser, PM_TOKEN_NEWLINE);
-                        expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN);
-                        rparen = parser->previous;
-                    }
+                    accept1(parser, PM_TOKEN_NEWLINE);
+                    expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN);
+                    rparen = parser->previous;
                 }
             } else {
                 lparen = not_provided(parser);

test/prism/errors/defined_empty.txt

@@ -8,12 +8,3 @@ defined? 1
 
 defined?("foo"
 )
-
-defined?
-1
-
-defined?
-(1)
-
-defined?
-()