prism 0.29.0 → 1.3.0

data/lib/prism/dispatcher.rb

@@ -22,7 +22,8 @@ module Prism
   #       end
   #     end
   #
-  #     dispatcher = Dispatcher.new
+  #     listener = OctalListener.new
+  #     dispatcher = Prism::Dispatcher.new
   #     dispatcher.register(listener, :on_integer_node_enter)
   #
   # Then, you can walk any number of trees and dispatch events to the listeners:
@@ -762,6 +763,14 @@ module Prism
       listeners[:on_interpolated_x_string_node_leave]&.each { |listener| listener.on_interpolated_x_string_node_leave(node) }
     end
 
+    # Dispatch enter and leave events for ItLocalVariableReadNode nodes and continue
+    # walking the tree.
+    def visit_it_local_variable_read_node(node)
+      listeners[:on_it_local_variable_read_node_enter]&.each { |listener| listener.on_it_local_variable_read_node_enter(node) }
+      super
+      listeners[:on_it_local_variable_read_node_leave]&.each { |listener| listener.on_it_local_variable_read_node_leave(node) }
+    end
+
     # Dispatch enter and leave events for ItParametersNode nodes and continue
     # walking the tree.
     def visit_it_parameters_node(node)
@@ -1795,6 +1804,12 @@ module Prism
         listeners[:on_interpolated_x_string_node_leave]&.each { |listener| listener.on_interpolated_x_string_node_leave(node) }
       end
 
+      # Dispatch enter and leave events for ItLocalVariableReadNode nodes.
+      def visit_it_local_variable_read_node(node)
+        listeners[:on_it_local_variable_read_node_enter]&.each { |listener| listener.on_it_local_variable_read_node_enter(node) }
+        listeners[:on_it_local_variable_read_node_leave]&.each { |listener| listener.on_it_local_variable_read_node_leave(node) }
+      end
+
       # Dispatch enter and leave events for ItParametersNode nodes.
       def visit_it_parameters_node(node)
         listeners[:on_it_parameters_node_enter]&.each { |listener| listener.on_it_parameters_node_enter(node) }

data/lib/prism/dot_visitor.rb

@@ -909,10 +909,10 @@ module Prism
         table.field("conditions", "[]")
       end
 
-      # consequent
-      unless (consequent = node.consequent).nil?
-        table.field("consequent", port: true)
-        digraph.edge("#{id}:consequent -> #{node_id(consequent)};")
+      # else_clause
+      unless (else_clause = node.else_clause).nil?
+        table.field("else_clause", port: true)
+        digraph.edge("#{id}:else_clause -> #{node_id(else_clause)};")
       end
 
       # case_keyword_loc
@@ -954,10 +954,10 @@ module Prism
         table.field("conditions", "[]")
       end
 
-      # consequent
-      unless (consequent = node.consequent).nil?
-        table.field("consequent", port: true)
-        digraph.edge("#{id}:consequent -> #{node_id(consequent)};")
+      # else_clause
+      unless (else_clause = node.else_clause).nil?
+        table.field("else_clause", port: true)
+        digraph.edge("#{id}:else_clause -> #{node_id(else_clause)};")
       end
 
       # case_keyword_loc
@@ -2130,10 +2130,10 @@ module Prism
         digraph.edge("#{id}:statements -> #{node_id(statements)};")
       end
 
-      # consequent
-      unless (consequent = node.consequent).nil?
-        table.field("consequent", port: true)
-        digraph.edge("#{id}:consequent -> #{node_id(consequent)};")
+      # subsequent
+      unless (subsequent = node.subsequent).nil?
+        table.field("subsequent", port: true)
+        digraph.edge("#{id}:subsequent -> #{node_id(subsequent)};")
       end
 
       # end_keyword_loc
@@ -2780,6 +2780,20 @@ module Prism
       super
     end
 
+    # Visit a ItLocalVariableReadNode node.
+    def visit_it_local_variable_read_node(node)
+      table = Table.new("ItLocalVariableReadNode")
+      id = node_id(node)
+
+      digraph.nodes << <<~DOT
+        #{id} [
+          label=<#{table.to_dot.gsub(/\n/, "\n  ")}>
+        ];
+      DOT
+
+      super
+    end
+
     # Visit a ItParametersNode node.
     def visit_it_parameters_node(node)
       table = Table.new("ItParametersNode")
@@ -3779,9 +3793,14 @@ module Prism
       table = Table.new("RationalNode")
       id = node_id(node)
 
-      # numeric
-      table.field("numeric", port: true)
-      digraph.edge("#{id}:numeric -> #{node_id(node.numeric)};")
+      # flags
+      table.field("flags", integer_base_flags_inspect(node))
+
+      # numerator
+      table.field("numerator", node.numerator.inspect)
+
+      # denominator
+      table.field("denominator", node.denominator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -3941,10 +3960,10 @@ module Prism
         digraph.edge("#{id}:statements -> #{node_id(statements)};")
       end
 
-      # consequent
-      unless (consequent = node.consequent).nil?
-        table.field("consequent", port: true)
-        digraph.edge("#{id}:consequent -> #{node_id(consequent)};")
+      # subsequent
+      unless (subsequent = node.subsequent).nil?
+        table.field("subsequent", port: true)
+        digraph.edge("#{id}:subsequent -> #{node_id(subsequent)};")
       end
 
       digraph.nodes << <<~DOT
@@ -4003,9 +4022,6 @@ module Prism
       table = Table.new("ReturnNode")
       id = node_id(node)
 
-      # flags
-      table.field("flags", return_node_flags_inspect(node))
-
       # keyword_loc
       table.field("keyword_loc", location_inspect(node.keyword_loc))
 
@@ -4367,10 +4383,10 @@ module Prism
         digraph.edge("#{id}:statements -> #{node_id(statements)};")
       end
 
-      # consequent
-      unless (consequent = node.consequent).nil?
-        table.field("consequent", port: true)
-        digraph.edge("#{id}:consequent -> #{node_id(consequent)};")
+      # else_clause
+      unless (else_clause = node.else_clause).nil?
+        table.field("else_clause", port: true)
+        digraph.edge("#{id}:else_clause -> #{node_id(else_clause)};")
       end
 
       # end_keyword_loc
@@ -4398,6 +4414,11 @@ module Prism
       # keyword_loc
       table.field("keyword_loc", location_inspect(node.keyword_loc))
 
+      # do_keyword_loc
+      unless (do_keyword_loc = node.do_keyword_loc).nil?
+        table.field("do_keyword_loc", location_inspect(do_keyword_loc))
+      end
+
       # closing_loc
       unless (closing_loc = node.closing_loc).nil?
         table.field("closing_loc", location_inspect(closing_loc))
@@ -4474,6 +4495,11 @@ module Prism
       # keyword_loc
       table.field("keyword_loc", location_inspect(node.keyword_loc))
 
+      # do_keyword_loc
+      unless (do_keyword_loc = node.do_keyword_loc).nil?
+        table.field("do_keyword_loc", location_inspect(do_keyword_loc))
+      end
+
       # closing_loc
       unless (closing_loc = node.closing_loc).nil?
         table.field("closing_loc", location_inspect(closing_loc))
@@ -4576,8 +4602,11 @@ module Prism
     # comma-separated list.
     def arguments_node_flags_inspect(node)
       flags = [] #: Array[String]
+      flags << "contains_forwarding" if node.contains_forwarding?
       flags << "contains_keywords" if node.contains_keywords?
       flags << "contains_keyword_splat" if node.contains_keyword_splat?
+      flags << "contains_splat" if node.contains_splat?
+      flags << "contains_multiple_splats" if node.contains_multiple_splats?
       flags.join(", ")
     end
 
@@ -4679,14 +4708,6 @@ module Prism
       flags.join(", ")
     end
 
-    # Inspect a node that has return_node_flags flags to display the flags as a
-    # comma-separated list.
-    def return_node_flags_inspect(node)
-      flags = [] #: Array[String]
-      flags << "redundant" if node.redundant?
-      flags.join(", ")
-    end
-
     # Inspect a node that has shareable_constant_node_flags flags to display the flags as a
     # comma-separated list.
     def shareable_constant_node_flags_inspect(node)