prism 0.27.0 → 0.29.0

data/lib/prism/dot_visitor.rb

@@ -765,11 +765,11 @@ module Prism
       # write_name
       table.field("write_name", node.write_name.inspect)
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
@@ -1060,15 +1060,15 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -1205,15 +1205,15 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -1287,13 +1287,15 @@ module Prism
         digraph.edge("#{id}:parent -> #{node_id(parent)};")
       end
 
-      # child
-      table.field("child", port: true)
-      digraph.edge("#{id}:child -> #{node_id(node.child)};")
+      # name
+      table.field("name", node.name.inspect)
 
       # delimiter_loc
       table.field("delimiter_loc", location_inspect(node.delimiter_loc))
 
+      # name_loc
+      table.field("name_loc", location_inspect(node.name_loc))
+
       digraph.nodes << <<~DOT
         #{id} [
           label=<#{table.to_dot.gsub(/\n/, "\n  ")}>
@@ -1312,15 +1314,15 @@ module Prism
       table.field("target", port: true)
       digraph.edge("#{id}:target -> #{node_id(node.target)};")
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -1367,13 +1369,15 @@ module Prism
         digraph.edge("#{id}:parent -> #{node_id(parent)};")
       end
 
-      # child
-      table.field("child", port: true)
-      digraph.edge("#{id}:child -> #{node_id(node.child)};")
+      # name
+      table.field("name", node.name.inspect)
 
       # delimiter_loc
       table.field("delimiter_loc", location_inspect(node.delimiter_loc))
 
+      # name_loc
+      table.field("name_loc", location_inspect(node.name_loc))
+
       digraph.nodes << <<~DOT
         #{id} [
           label=<#{table.to_dot.gsub(/\n/, "\n  ")}>
@@ -1912,15 +1916,15 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -2318,11 +2322,11 @@ module Prism
         digraph.edge("#{id}:block -> #{node_id(block)};")
       end
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
@@ -2467,15 +2471,15 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -2924,8 +2928,8 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
@@ -2934,8 +2938,8 @@ module Prism
       # name
       table.field("name", node.name.inspect)
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       # depth
       table.field("depth", node.depth.inspect)
@@ -3999,6 +4003,9 @@ 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))
 
@@ -4569,6 +4576,7 @@ module Prism
     # comma-separated list.
     def arguments_node_flags_inspect(node)
       flags = [] #: Array[String]
+      flags << "contains_keywords" if node.contains_keywords?
       flags << "contains_keyword_splat" if node.contains_keyword_splat?
       flags.join(", ")
     end
@@ -4671,6 +4679,14 @@ 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)

data/lib/prism/dsl.rb

@@ -10,7 +10,7 @@ module Prism
   # The DSL module provides a set of methods that can be used to create prism
   # nodes in a more concise manner. For example, instead of writing:
   #
-  #     source = Prism::Source.new("[1]")
+  #     source = Prism::Source.for("[1]")
   #
   #     Prism::ArrayNode.new(
   #       [
@@ -28,7 +28,7 @@ module Prism
   #
   # you could instead write:
   #
-  #     source = Prism::Source.new("[1]")
+  #     source = Prism::Source.for("[1]")
   #
   #     ArrayNode(
   #       IntegerNode(Prism::IntegerBaseFlags::DECIMAL, 1, Location(source, 1, 1)), source),
@@ -143,8 +143,8 @@ module Prism
     end
 
     # Create a new CallOperatorWriteNode node
-    def CallOperatorWriteNode(flags, receiver, call_operator_loc, message_loc, read_name, write_name, operator, operator_loc, value, source = nil, location = Location())
-      CallOperatorWriteNode.new(source, flags, receiver, call_operator_loc, message_loc, read_name, write_name, operator, operator_loc, value, location)
+    def CallOperatorWriteNode(flags, receiver, call_operator_loc, message_loc, read_name, write_name, binary_operator, binary_operator_loc, value, source = nil, location = Location())
+      CallOperatorWriteNode.new(source, flags, receiver, call_operator_loc, message_loc, read_name, write_name, binary_operator, binary_operator_loc, value, location)
     end
 
     # Create a new CallOrWriteNode node
@@ -183,8 +183,8 @@ module Prism
     end
 
     # Create a new ClassVariableOperatorWriteNode node
-    def ClassVariableOperatorWriteNode(name, name_loc, operator_loc, value, operator, source = nil, location = Location())
-      ClassVariableOperatorWriteNode.new(source, name, name_loc, operator_loc, value, operator, location)
+    def ClassVariableOperatorWriteNode(name, name_loc, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      ClassVariableOperatorWriteNode.new(source, name, name_loc, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new ClassVariableOrWriteNode node
@@ -213,8 +213,8 @@ module Prism
     end
 
     # Create a new ConstantOperatorWriteNode node
-    def ConstantOperatorWriteNode(name, name_loc, operator_loc, value, operator, source = nil, location = Location())
-      ConstantOperatorWriteNode.new(source, name, name_loc, operator_loc, value, operator, location)
+    def ConstantOperatorWriteNode(name, name_loc, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      ConstantOperatorWriteNode.new(source, name, name_loc, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new ConstantOrWriteNode node
@@ -228,13 +228,13 @@ module Prism
     end
 
     # Create a new ConstantPathNode node
-    def ConstantPathNode(parent, child, delimiter_loc, source = nil, location = Location())
-      ConstantPathNode.new(source, parent, child, delimiter_loc, location)
+    def ConstantPathNode(parent, name, delimiter_loc, name_loc, source = nil, location = Location())
+      ConstantPathNode.new(source, parent, name, delimiter_loc, name_loc, location)
     end
 
     # Create a new ConstantPathOperatorWriteNode node
-    def ConstantPathOperatorWriteNode(target, operator_loc, value, operator, source = nil, location = Location())
-      ConstantPathOperatorWriteNode.new(source, target, operator_loc, value, operator, location)
+    def ConstantPathOperatorWriteNode(target, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      ConstantPathOperatorWriteNode.new(source, target, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new ConstantPathOrWriteNode node
@@ -243,8 +243,8 @@ module Prism
     end
 
     # Create a new ConstantPathTargetNode node
-    def ConstantPathTargetNode(parent, child, delimiter_loc, source = nil, location = Location())
-      ConstantPathTargetNode.new(source, parent, child, delimiter_loc, location)
+    def ConstantPathTargetNode(parent, name, delimiter_loc, name_loc, source = nil, location = Location())
+      ConstantPathTargetNode.new(source, parent, name, delimiter_loc, name_loc, location)
     end
 
     # Create a new ConstantPathWriteNode node
@@ -343,8 +343,8 @@ module Prism
     end
 
     # Create a new GlobalVariableOperatorWriteNode node
-    def GlobalVariableOperatorWriteNode(name, name_loc, operator_loc, value, operator, source = nil, location = Location())
-      GlobalVariableOperatorWriteNode.new(source, name, name_loc, operator_loc, value, operator, location)
+    def GlobalVariableOperatorWriteNode(name, name_loc, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      GlobalVariableOperatorWriteNode.new(source, name, name_loc, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new GlobalVariableOrWriteNode node
@@ -408,8 +408,8 @@ module Prism
     end
 
     # Create a new IndexOperatorWriteNode node
-    def IndexOperatorWriteNode(flags, receiver, call_operator_loc, opening_loc, arguments, closing_loc, block, operator, operator_loc, value, source = nil, location = Location())
-      IndexOperatorWriteNode.new(source, flags, receiver, call_operator_loc, opening_loc, arguments, closing_loc, block, operator, operator_loc, value, location)
+    def IndexOperatorWriteNode(flags, receiver, call_operator_loc, opening_loc, arguments, closing_loc, block, binary_operator, binary_operator_loc, value, source = nil, location = Location())
+      IndexOperatorWriteNode.new(source, flags, receiver, call_operator_loc, opening_loc, arguments, closing_loc, block, binary_operator, binary_operator_loc, value, location)
     end
 
     # Create a new IndexOrWriteNode node
@@ -428,8 +428,8 @@ module Prism
     end
 
     # Create a new InstanceVariableOperatorWriteNode node
-    def InstanceVariableOperatorWriteNode(name, name_loc, operator_loc, value, operator, source = nil, location = Location())
-      InstanceVariableOperatorWriteNode.new(source, name, name_loc, operator_loc, value, operator, location)
+    def InstanceVariableOperatorWriteNode(name, name_loc, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      InstanceVariableOperatorWriteNode.new(source, name, name_loc, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new InstanceVariableOrWriteNode node
@@ -508,8 +508,8 @@ module Prism
     end
 
     # Create a new LocalVariableOperatorWriteNode node
-    def LocalVariableOperatorWriteNode(name_loc, operator_loc, value, name, operator, depth, source = nil, location = Location())
-      LocalVariableOperatorWriteNode.new(source, name_loc, operator_loc, value, name, operator, depth, location)
+    def LocalVariableOperatorWriteNode(name_loc, binary_operator_loc, value, name, binary_operator, depth, source = nil, location = Location())
+      LocalVariableOperatorWriteNode.new(source, name_loc, binary_operator_loc, value, name, binary_operator, depth, location)
     end
 
     # Create a new LocalVariableOrWriteNode node
@@ -698,8 +698,8 @@ module Prism
     end
 
     # Create a new ReturnNode node
-    def ReturnNode(keyword_loc, arguments, source = nil, location = Location())
-      ReturnNode.new(source, keyword_loc, arguments, location)
+    def ReturnNode(flags, keyword_loc, arguments, source = nil, location = Location())
+      ReturnNode.new(source, flags, keyword_loc, arguments, location)
     end
 
     # Create a new SelfNode node

data/lib/prism/ffi.rb

@@ -317,7 +317,7 @@ module Prism
         buffer.read
       end
 
-      Serialize.load_tokens(Source.new(code), serialized)
+      Serialize.load_tokens(Source.for(code), serialized)
     end
 
     def parse_common(string, code, options) # :nodoc:
@@ -329,7 +329,7 @@ module Prism
       LibRubyParser::PrismBuffer.with do |buffer|
         LibRubyParser.pm_serialize_parse_comments(buffer.pointer, string.pointer, string.length, dump_options(options))
 
-        source = Source.new(code)
+        source = Source.for(code)
         loader = Serialize::Loader.new(source, buffer.read)
 
         loader.load_header
@@ -343,7 +343,7 @@ module Prism
       LibRubyParser::PrismBuffer.with do |buffer|
         LibRubyParser.pm_serialize_parse_lex(buffer.pointer, string.pointer, string.length, dump_options(options))
 
-        source = Source.new(code)
+        source = Source.for(code)
         loader = Serialize::Loader.new(source, buffer.read)
 
         tokens = loader.load_tokens
@@ -408,7 +408,7 @@ module Prism
       values << dump_options_command_line(options)
 
       template << "C"
-      values << { nil => 0, "3.3.0" => 1, "3.4.0" => 0, "latest" => 0 }.fetch(options[:version])
+      values << { nil => 0, "3.3.0" => 1, "3.3.1" => 1, "3.4.0" => 0, "latest" => 0 }.fetch(options[:version])
 
       template << "L"
       if (scopes = options[:scopes])