syntax_tree 4.2.0 → 5.0.0

data/lib/syntax_tree/parser.rb

@@ -421,11 +421,11 @@ module SyntaxTree
     #   on_alias: (
     #     (DynaSymbol | SymbolLiteral) left,
     #     (DynaSymbol | SymbolLiteral) right
-    #   ) -> Alias
+    #   ) -> AliasNode
     def on_alias(left, right)
       keyword = consume_keyword(:alias)
 
-      Alias.new(
+      AliasNode.new(
         left: left,
         right: right,
         location: keyword.location.to(right.location)
@@ -575,7 +575,7 @@ module SyntaxTree
     def on_args_forward
       op = consume_operator(:"...")
 
-      ArgsForward.new(value: op.value, location: op.location)
+      ArgsForward.new(location: op.location)
     end
 
     # :call-seq:
@@ -920,7 +920,7 @@ module SyntaxTree
     #   on_brace_block: (
     #     (nil | BlockVar) block_var,
     #     Statements statements
-    #   ) -> BraceBlock
+    #   ) -> BlockNode
     def on_brace_block(block_var, statements)
       lbrace = consume_token(LBrace)
       rbrace = consume_token(RBrace)
@@ -947,10 +947,10 @@ module SyntaxTree
           end_column: rbrace.location.end_column
         )
 
-      BraceBlock.new(
-        lbrace: lbrace,
+      BlockNode.new(
+        opening: lbrace,
         block_var: block_var,
-        statements: statements,
+        bodystmt: statements,
         location: location
       )
     end
@@ -971,7 +971,7 @@ module SyntaxTree
     #     untyped receiver,
     #     (:"::" | Op | Period) operator,
     #     (:call | Backtick | Const | Ident | Op) message
-    #   ) -> Call
+    #   ) -> CallNode
     def on_call(receiver, operator, message)
       ending =
         if message != :call
@@ -982,7 +982,7 @@ module SyntaxTree
           receiver
         end
 
-      Call.new(
+      CallNode.new(
         receiver: receiver,
         operator: operator,
         message: message,
@@ -1076,6 +1076,7 @@ module SyntaxTree
       Command.new(
         message: message,
         arguments: arguments,
+        block: nil,
         location: message.location.to(arguments.location)
       )
     end
@@ -1095,6 +1096,7 @@ module SyntaxTree
         operator: operator,
         message: message,
         arguments: arguments,
+        block: nil,
         location: receiver.location.to(ending.location)
       )
     end
@@ -1181,7 +1183,7 @@ module SyntaxTree
     #     (Backtick | Const | Ident | Kw | Op) name,
     #     (nil | Params | Paren) params,
     #     untyped bodystmt
-    #   ) -> Def | DefEndless
+    #   ) -> DefNode
     def on_def(name, params, bodystmt)
       # Make sure to delete this token in case you're defining something like
       # def class which would lead to this being a kw and causing all kinds of
@@ -1223,7 +1225,9 @@ module SyntaxTree
           ending.location.start_column
         )
 
-        Def.new(
+        DefNode.new(
+          target: nil,
+          operator: nil,
           name: name,
           params: params,
           bodystmt: bodystmt,
@@ -1234,12 +1238,12 @@ module SyntaxTree
         # the statements list. Before, it was just the individual statement.
         statement = bodystmt.is_a?(BodyStmt) ? bodystmt.statements : bodystmt
 
-        DefEndless.new(
+        DefNode.new(
           target: nil,
           operator: nil,
           name: name,
-          paren: params,
-          statement: statement,
+          params: params,
+          bodystmt: statement,
           location: beginning.location.to(bodystmt.location)
         )
       end
@@ -1270,7 +1274,7 @@ module SyntaxTree
     #     (Backtick | Const | Ident | Kw | Op) name,
     #     (Params | Paren) params,
     #     BodyStmt bodystmt
-    #   ) -> Defs
+    #   ) -> DefNode
     def on_defs(target, operator, name, params, bodystmt)
       # Make sure to delete this token in case you're defining something
       # like def class which would lead to this being a kw and causing all kinds
@@ -1309,7 +1313,7 @@ module SyntaxTree
           ending.location.start_column
         )
 
-        Defs.new(
+        DefNode.new(
           target: target,
           operator: operator,
           name: name,
@@ -1322,19 +1326,19 @@ module SyntaxTree
         # the statements list. Before, it was just the individual statement.
         statement = bodystmt.is_a?(BodyStmt) ? bodystmt.statements : bodystmt
 
-        DefEndless.new(
+        DefNode.new(
           target: target,
           operator: operator,
           name: name,
-          paren: params,
-          statement: statement,
+          params: params,
+          bodystmt: statement,
           location: beginning.location.to(bodystmt.location)
         )
       end
     end
 
     # :call-seq:
-    #   on_do_block: (BlockVar block_var, BodyStmt bodystmt) -> DoBlock
+    #   on_do_block: (BlockVar block_var, BodyStmt bodystmt) -> BlockNode
     def on_do_block(block_var, bodystmt)
       beginning = consume_keyword(:do)
       ending = consume_keyword(:end)
@@ -1348,8 +1352,8 @@ module SyntaxTree
         ending.location.start_column
       )
 
-      DoBlock.new(
-        keyword: beginning,
+      BlockNode.new(
+        opening: beginning,
         block_var: block_var,
         bodystmt: bodystmt,
         location: beginning.location.to(ending.location)
@@ -1357,30 +1361,32 @@ module SyntaxTree
     end
 
     # :call-seq:
-    #   on_dot2: ((nil | untyped) left, (nil | untyped) right) -> Dot2
+    #   on_dot2: ((nil | untyped) left, (nil | untyped) right) -> RangeNode
     def on_dot2(left, right)
       operator = consume_operator(:"..")
 
       beginning = left || operator
       ending = right || operator
 
-      Dot2.new(
+      RangeNode.new(
         left: left,
+        operator: operator,
         right: right,
         location: beginning.location.to(ending.location)
       )
     end
 
     # :call-seq:
-    #   on_dot3: ((nil | untyped) left, (nil | untyped) right) -> Dot3
+    #   on_dot3: ((nil | untyped) left, (nil | untyped) right) -> RangeNode
     def on_dot3(left, right)
       operator = consume_operator(:"...")
 
       beginning = left || operator
       ending = right || operator
 
-      Dot3.new(
+      RangeNode.new(
         left: left,
+        operator: operator,
         right: right,
         location: beginning.location.to(ending.location)
       )
@@ -1608,9 +1614,15 @@ module SyntaxTree
     end
 
     # :call-seq:
-    #   on_fcall: ((Const | Ident) value) -> FCall
+    #   on_fcall: ((Const | Ident) value) -> CallNode
     def on_fcall(value)
-      FCall.new(value: value, arguments: nil, location: value.location)
+      CallNode.new(
+        receiver: nil,
+        operator: nil,
+        message: value,
+        arguments: nil,
+        location: value.location
+      )
     end
 
     # :call-seq:
@@ -1878,7 +1890,7 @@ module SyntaxTree
     #     untyped predicate,
     #     Statements statements,
     #     (nil | Elsif | Else) consequent
-    #   ) -> If
+    #   ) -> IfNode
     def on_if(predicate, statements, consequent)
       beginning = consume_keyword(:if)
       ending = consequent || consume_keyword(:end)
@@ -1891,7 +1903,7 @@ module SyntaxTree
         ending.location.start_column
       )
 
-      If.new(
+      IfNode.new(
         predicate: predicate,
         statements: statements,
         consequent: consequent,
@@ -1911,13 +1923,15 @@ module SyntaxTree
     end
 
     # :call-seq:
-    #   on_if_mod: (untyped predicate, untyped statement) -> IfMod
+    #   on_if_mod: (untyped predicate, untyped statement) -> IfNode
     def on_if_mod(predicate, statement)
       consume_keyword(:if)
 
-      IfMod.new(
-        statement: statement,
+      IfNode.new(
         predicate: predicate,
+        statements:
+          Statements.new(self, body: [statement], location: statement.location),
+        consequent: nil,
         location: statement.location.to(predicate.location)
       )
     end
@@ -2104,17 +2118,20 @@ module SyntaxTree
           location = params.contents.location
           location = location.to(locals.last.location) if locals.any?
 
-          Paren.new(
-            lparen: params.lparen,
-            contents:
-              LambdaVar.new(
-                params: params.contents,
-                locals: locals,
-                location: location
-              ),
-            location: params.location,
-            comments: params.comments
-          )
+          node =
+            Paren.new(
+              lparen: params.lparen,
+              contents:
+                LambdaVar.new(
+                  params: params.contents,
+                  locals: locals,
+                  location: location
+                ),
+              location: params.location
+            )
+
+          node.comments.concat(params.comments)
+          node
         when Params
           # In this case we've gotten to the <3.2 plain set of parameters. In
           # this case there cannot be lambda locals, so we will wrap the
@@ -2302,37 +2319,42 @@ module SyntaxTree
 
     # :call-seq:
     #   on_method_add_arg: (
-    #     (Call | FCall) call,
+    #     CallNode call,
     #     (ArgParen | Args) arguments
-    #   ) -> Call | FCall
+    #   ) -> CallNode
     def on_method_add_arg(call, arguments)
       location = call.location
       location = location.to(arguments.location) if arguments.is_a?(ArgParen)
 
-      if call.is_a?(FCall)
-        FCall.new(value: call.value, arguments: arguments, location: location)
-      else
-        Call.new(
-          receiver: call.receiver,
-          operator: call.operator,
-          message: call.message,
-          arguments: arguments,
-          location: location
-        )
-      end
+      CallNode.new(
+        receiver: call.receiver,
+        operator: call.operator,
+        message: call.message,
+        arguments: arguments,
+        location: location
+      )
     end
 
     # :call-seq:
     #   on_method_add_block: (
-    #     (Call | Command | CommandCall | FCall) call,
-    #     (BraceBlock | DoBlock) block
+    #     (Call | Command | CommandCall) call,
+    #     Block block
     #   ) -> MethodAddBlock
     def on_method_add_block(call, block)
-      MethodAddBlock.new(
-        call: call,
-        block: block,
-        location: call.location.to(block.location)
-      )
+      location = call.location.to(block.location)
+
+      case call
+      when Command, CommandCall
+        node = call.copy(block: block, location: location)
+        node.comments.concat(call.comments)
+        node
+      else
+        MethodAddBlock.new(
+          call: call,
+          block: block,
+          location: call.location.to(block.location)
+        )
+      end
     end
 
     # :call-seq:
@@ -2900,7 +2922,7 @@ module SyntaxTree
     def on_redo
       keyword = consume_keyword(:redo)
 
-      Redo.new(value: keyword.value, location: keyword.location)
+      Redo.new(location: keyword.location)
     end
 
     # :call-seq:
@@ -3066,26 +3088,26 @@ module SyntaxTree
     def on_retry
       keyword = consume_keyword(:retry)
 
-      Retry.new(value: keyword.value, location: keyword.location)
+      Retry.new(location: keyword.location)
     end
 
     # :call-seq:
-    #   on_return: (Args arguments) -> Return
+    #   on_return: (Args arguments) -> ReturnNode
     def on_return(arguments)
       keyword = consume_keyword(:return)
 
-      Return.new(
+      ReturnNode.new(
         arguments: arguments,
         location: keyword.location.to(arguments.location)
       )
     end
 
     # :call-seq:
-    #   on_return0: () -> Return0
+    #   on_return0: () -> ReturnNode
     def on_return0
       keyword = consume_keyword(:return)
 
-      Return0.new(value: keyword.value, location: keyword.location)
+      ReturnNode.new(arguments: nil, location: keyword.location)
     end
 
     # :call-seq:
@@ -3562,7 +3584,7 @@ module SyntaxTree
     #     untyped predicate,
     #     Statements statements,
     #     ((nil | Elsif | Else) consequent)
-    #   ) -> Unless
+    #   ) -> UnlessNode
     def on_unless(predicate, statements, consequent)
       beginning = consume_keyword(:unless)
       ending = consequent || consume_keyword(:end)
@@ -3575,7 +3597,7 @@ module SyntaxTree
         ending.location.start_column
       )
 
-      Unless.new(
+      UnlessNode.new(
         predicate: predicate,
         statements: statements,
         consequent: consequent,
@@ -3584,19 +3606,21 @@ module SyntaxTree
     end
 
     # :call-seq:
-    #   on_unless_mod: (untyped predicate, untyped statement) -> UnlessMod
+    #   on_unless_mod: (untyped predicate, untyped statement) -> UnlessNode
     def on_unless_mod(predicate, statement)
       consume_keyword(:unless)
 
-      UnlessMod.new(
-        statement: statement,
+      UnlessNode.new(
         predicate: predicate,
+        statements:
+          Statements.new(self, body: [statement], location: statement.location),
+        consequent: nil,
         location: statement.location.to(predicate.location)
       )
     end
 
     # :call-seq:
-    #   on_until: (untyped predicate, Statements statements) -> Until
+    #   on_until: (untyped predicate, Statements statements) -> UntilNode
     def on_until(predicate, statements)
       beginning = consume_keyword(:until)
       ending = consume_keyword(:end)
@@ -3618,7 +3642,7 @@ module SyntaxTree
         ending.location.start_column
       )
 
-      Until.new(
+      UntilNode.new(
         predicate: predicate,
         statements: statements,
         location: beginning.location.to(ending.location)
@@ -3626,23 +3650,24 @@ module SyntaxTree
     end
 
     # :call-seq:
-    #   on_until_mod: (untyped predicate, untyped statement) -> UntilMod
+    #   on_until_mod: (untyped predicate, untyped statement) -> UntilNode
     def on_until_mod(predicate, statement)
       consume_keyword(:until)
 
-      UntilMod.new(
-        statement: statement,
+      UntilNode.new(
         predicate: predicate,
+        statements:
+          Statements.new(self, body: [statement], location: statement.location),
         location: statement.location.to(predicate.location)
       )
     end
 
     # :call-seq:
-    #   on_var_alias: (GVar left, (Backref | GVar) right) -> VarAlias
+    #   on_var_alias: (GVar left, (Backref | GVar) right) -> AliasNode
     def on_var_alias(left, right)
       keyword = consume_keyword(:alias)
 
-      VarAlias.new(
+      AliasNode.new(
         left: left,
         right: right,
         location: keyword.location.to(right.location)
@@ -3722,7 +3747,7 @@ module SyntaxTree
     end
 
     # :call-seq:
-    #   on_while: (untyped predicate, Statements statements) -> While
+    #   on_while: (untyped predicate, Statements statements) -> WhileNode
     def on_while(predicate, statements)
       beginning = consume_keyword(:while)
       ending = consume_keyword(:end)
@@ -3744,7 +3769,7 @@ module SyntaxTree
         ending.location.start_column
       )
 
-      While.new(
+      WhileNode.new(
         predicate: predicate,
         statements: statements,
         location: beginning.location.to(ending.location)
@@ -3752,13 +3777,14 @@ module SyntaxTree
     end
 
     # :call-seq:
-    #   on_while_mod: (untyped predicate, untyped statement) -> WhileMod
+    #   on_while_mod: (untyped predicate, untyped statement) -> WhileNode
     def on_while_mod(predicate, statement)
       consume_keyword(:while)
 
-      WhileMod.new(
-        statement: statement,
+      WhileNode.new(
         predicate: predicate,
+        statements:
+          Statements.new(self, body: [statement], location: statement.location),
         location: statement.location.to(predicate.location)
       )
     end
@@ -3881,22 +3907,22 @@ module SyntaxTree
     end
 
     # :call-seq:
-    #   on_yield: ((Args | Paren) arguments) -> Yield
+    #   on_yield: ((Args | Paren) arguments) -> YieldNode
     def on_yield(arguments)
       keyword = consume_keyword(:yield)
 
-      Yield.new(
+      YieldNode.new(
         arguments: arguments,
         location: keyword.location.to(arguments.location)
       )
     end
 
     # :call-seq:
-    #   on_yield0: () -> Yield0
+    #   on_yield0: () -> YieldNode
     def on_yield0
       keyword = consume_keyword(:yield)
 
-      Yield0.new(value: keyword.value, location: keyword.location)
+      YieldNode.new(arguments: nil, location: keyword.location)
     end
 
     # :call-seq:
@@ -3904,7 +3930,7 @@ module SyntaxTree
     def on_zsuper
       keyword = consume_keyword(:super)
 
-      ZSuper.new(value: keyword.value, location: keyword.location)
+      ZSuper.new(location: keyword.location)
     end
   end
 end