prism 0.26.0 → 0.28.0

data/lib/prism/node_ext.rb

@@ -143,11 +143,12 @@ module Prism
       current = self #: node?
 
       while current.is_a?(ConstantPathNode)
-        child = current.child
-        if child.is_a?(MissingNode)
+        name = current.name
+        if name.nil?
           raise MissingNodesInConstantPathError, "Constant path contains missing nodes. Cannot compute full name"
         end
-        parts.unshift(child.name)
+
+        parts.unshift(name)
         current = current.parent
       end
 
@@ -162,6 +163,20 @@ module Prism
     def full_name
       full_name_parts.join("::")
     end
+
+    # Previously, we had a child node on this class that contained either a
+    # constant read or a missing node. To not cause a breaking change, we
+    # continue to supply that API.
+    def child
+      warn(<<~MSG, category: :deprecated)
+        DEPRECATED: ConstantPathNode#child is deprecated and will be removed \
+        in the next major version. Use \
+        ConstantPathNode#name/ConstantPathNode#name_loc instead. Called from \
+        #{caller(1, 1)&.first}.
+      MSG
+
+      name ? ConstantReadNode.new(source, name, name_loc) : MissingNode.new(source, location)
+    end
   end
 
   class ConstantPathTargetNode < Node
@@ -179,17 +194,31 @@ module Prism
           raise ConstantPathNode::DynamicPartsInConstantPathError, "Constant target path contains dynamic parts. Cannot compute full name"
         end
 
-      if child.is_a?(MissingNode)
+      if name.nil?
         raise ConstantPathNode::MissingNodesInConstantPathError, "Constant target path contains missing nodes. Cannot compute full name"
       end
 
-      parts.push(child.name)
+      parts.push(name)
     end
 
     # Returns the full name of this constant path. For example: "Foo::Bar"
     def full_name
       full_name_parts.join("::")
     end
+
+    # Previously, we had a child node on this class that contained either a
+    # constant read or a missing node. To not cause a breaking change, we
+    # continue to supply that API.
+    def child
+      warn(<<~MSG, category: :deprecated)
+        DEPRECATED: ConstantPathTargetNode#child is deprecated and will be \
+        removed in the next major version. Use \
+        ConstantPathTargetNode#name/ConstantPathTargetNode#name_loc instead. \
+        Called from #{caller(1, 1)&.first}.
+      MSG
+
+      name ? ConstantReadNode.new(source, name, name_loc) : MissingNode.new(source, location)
+    end
   end
 
   class ConstantTargetNode < Node

data/lib/prism/parse_result/newlines.rb

@@ -58,8 +58,6 @@ module Prism
 
     # Walk the tree and mark nodes that are on a new line.
     def mark_newlines!
-      value = self.value
-      raise "This method should only be called on a parse result that contains a node" unless Node === value
       value.accept(Newlines.new(Array.new(1 + source.offsets.size, false))) # steep:ignore
     end
   end

data/lib/prism/parse_result.rb

@@ -5,6 +5,14 @@ module Prism
   # conjunction with locations to allow them to resolve line numbers and source
   # ranges.
   class Source
+    # Create a new source object with the given source code. This method should
+    # be used instead of `new` and it will return either a `Source` or a
+    # specialized and more performant `ASCIISource` if no multibyte characters
+    # are present in the source code.
+    def self.for(source, start_line = 1, offsets = [])
+      source.ascii_only? ? ASCIISource.new(source, start_line, offsets): new(source, start_line, offsets)
+    end
+
     # The source code that this source object represents.
     attr_reader :source
 
@@ -27,6 +35,11 @@ module Prism
       source.encoding
     end
 
+    # Returns the lines of the source code as an array of strings.
+    def lines
+      source.lines
+    end
+
     # Perform a byteslice on the source code using the given byte offset and
     # byte length.
     def slice(byte_offset, length)
@@ -45,6 +58,12 @@ module Prism
       offsets[find_line(byte_offset)]
     end
 
+    # Returns the byte offset of the end of the line corresponding to the given
+    # byte offset.
+    def line_end(byte_offset)
+      offsets[find_line(byte_offset) + 1] || source.bytesize
+    end
+
     # Return the column number for the given byte offset.
     def column(byte_offset)
       byte_offset - line_start(byte_offset)
@@ -100,6 +119,39 @@ module Prism
     end
   end
 
+  # Specialized version of Prism::Source for source code that includes ASCII
+  # characters only. This class is used to apply performance optimizations that
+  # cannot be applied to sources that include multibyte characters. Sources that
+  # include multibyte characters are represented by the Prism::Source class.
+  class ASCIISource < Source
+    # Return the character offset for the given byte offset.
+    def character_offset(byte_offset)
+      byte_offset
+    end
+
+    # Return the column number in characters for the given byte offset.
+    def character_column(byte_offset)
+      byte_offset - line_start(byte_offset)
+    end
+
+    # Returns the offset from the start of the file for the given byte offset
+    # counting in code units for the given encoding.
+    #
+    # This method is tested with UTF-8, UTF-16, and UTF-32. If there is the
+    # concept of code units that differs from the number of characters in other
+    # encodings, it is not captured here.
+    def code_units_offset(byte_offset, encoding)
+      byte_offset
+    end
+
+    # Specialized version of `code_units_column` that does not depend on
+    # `code_units_offset`, which is a more expensive operation. This is
+    # essentialy the same as `Prism::Source#column`.
+    def code_units_column(byte_offset, encoding)
+      byte_offset - line_start(byte_offset)
+    end
+  end
+
   # This represents a location in the source.
   class Location
     # A Source object that is used to determine more information from the given
@@ -171,11 +223,25 @@ module Prism
       "#<Prism::Location @start_offset=#{@start_offset} @length=#{@length} start_line=#{start_line}>"
     end
 
+    # Returns all of the lines of the source code associated with this location.
+    def source_lines
+      source.lines
+    end
+
     # The source code that this location represents.
     def slice
       source.slice(start_offset, length)
     end
 
+    # The source code that this location represents starting from the beginning
+    # of the line that this location starts on to the end of the line that this
+    # location ends on.
+    def slice_lines
+      line_start = source.line_start(start_offset)
+      line_end = source.line_end(end_offset)
+      source.slice(line_start, line_end - line_start)
+    end
+
     # The character offset from the beginning of the source where this location
     # starts.
     def start_character_offset
@@ -281,6 +347,18 @@ module Prism
 
       Location.new(source, start_offset, other.end_offset - start_offset)
     end
+
+    # Join this location with the first occurrence of the string in the source
+    # that occurs after this location on the same line, and return the new
+    # location. This will raise an error if the string does not exist.
+    def adjoin(string)
+      line_suffix = source.slice(end_offset, source.line_end(end_offset) - end_offset)
+
+      line_suffix_index = line_suffix.byteindex(string)
+      raise "Could not find #{string}" if line_suffix_index.nil?
+
+      Location.new(source, start_offset, length + line_suffix_index + string.bytesize)
+    end
   end
 
   # This represents a comment that was encountered during parsing. It is the
@@ -438,14 +516,9 @@ module Prism
   end
 
   # This represents the result of a call to ::parse or ::parse_file. It contains
-  # the AST, any comments that were encounters, and any errors that were
-  # encountered.
-  class ParseResult
-    # The value that was generated by parsing. Normally this holds the AST, but
-    # it can sometimes how a list of tokens or other results passed back from
-    # the parser.
-    attr_reader :value
-
+  # the requested structure, any comments that were encounters, and any errors
+  # that were encountered.
+  class Result
     # The list of comments that were encountered during parsing.
     attr_reader :comments
 
@@ -466,9 +539,8 @@ module Prism
     # A Source instance that represents the source code that was parsed.
     attr_reader :source
 
-    # Create a new parse result object with the given values.
-    def initialize(value, comments, magic_comments, data_loc, errors, warnings, source)
-      @value = value
+    # Create a new result object with the given values.
+    def initialize(comments, magic_comments, data_loc, errors, warnings, source)
       @comments = comments
       @magic_comments = magic_comments
       @data_loc = data_loc
@@ -477,9 +549,9 @@ module Prism
       @source = source
     end
 
-    # Implement the hash pattern matching interface for ParseResult.
+    # Implement the hash pattern matching interface for Result.
     def deconstruct_keys(keys)
-      { value: value, comments: comments, magic_comments: magic_comments, data_loc: data_loc, errors: errors, warnings: warnings }
+      { comments: comments, magic_comments: magic_comments, data_loc: data_loc, errors: errors, warnings: warnings }
     end
 
     # Returns the encoding of the source code that was parsed.
@@ -500,6 +572,58 @@ module Prism
     end
   end
 
+  # This is a result specific to the `parse` and `parse_file` methods.
+  class ParseResult < Result
+    # The syntax tree that was parsed from the source code.
+    attr_reader :value
+
+    # Create a new parse result object with the given values.
+    def initialize(value, comments, magic_comments, data_loc, errors, warnings, source)
+      @value = value
+      super(comments, magic_comments, data_loc, errors, warnings, source)
+    end
+
+    # Implement the hash pattern matching interface for ParseResult.
+    def deconstruct_keys(keys)
+      super.merge!(value: value)
+    end
+  end
+
+  # This is a result specific to the `lex` and `lex_file` methods.
+  class LexResult < Result
+    # The list of tokens that were parsed from the source code.
+    attr_reader :value
+
+    # Create a new lex result object with the given values.
+    def initialize(value, comments, magic_comments, data_loc, errors, warnings, source)
+      @value = value
+      super(comments, magic_comments, data_loc, errors, warnings, source)
+    end
+
+    # Implement the hash pattern matching interface for LexResult.
+    def deconstruct_keys(keys)
+      super.merge!(value: value)
+    end
+  end
+
+  # This is a result specific to the `parse_lex` and `parse_lex_file` methods.
+  class ParseLexResult < Result
+    # A tuple of the syntax tree and the list of tokens that were parsed from
+    # the source code.
+    attr_reader :value
+
+    # Create a new parse lex result object with the given values.
+    def initialize(value, comments, magic_comments, data_loc, errors, warnings, source)
+      @value = value
+      super(comments, magic_comments, data_loc, errors, warnings, source)
+    end
+
+    # Implement the hash pattern matching interface for ParseLexResult.
+    def deconstruct_keys(keys)
+      super.merge!(value: value)
+    end
+  end
+
   # This represents a token from the Ruby source.
   class Token
     # The Source object that represents the source this token came from.

data/lib/prism/pattern.rb

@@ -149,7 +149,10 @@ module Prism
       parent = node.parent
 
       if parent.is_a?(ConstantReadNode) && parent.slice == "Prism"
-        compile_node(node.child)
+        name = node.name
+        raise CompilationError, node.inspect if name.nil?
+
+        compile_constant_name(node, name)
       else
         compile_error(node)
       end
@@ -158,14 +161,17 @@ module Prism
     # in ConstantReadNode
     # in String
     def compile_constant_read_node(node)
-      value = node.slice
+      compile_constant_name(node, node.name)
+    end
 
-      if Prism.const_defined?(value, false)
-        clazz = Prism.const_get(value)
+    # Compile a name associated with a constant.
+    def compile_constant_name(node, name)
+      if Prism.const_defined?(name, false)
+        clazz = Prism.const_get(name)
 
         ->(other) { clazz === other }
-      elsif Object.const_defined?(value, false)
-        clazz = Object.const_get(value)
+      elsif Object.const_defined?(name, false)
+        clazz = Object.const_get(name)
 
         ->(other) { clazz === other }
       else

data/lib/prism/polyfill/byteindex.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Polyfill for String#byteindex, which didn't exist until Ruby 3.2.
+if !("".respond_to?(:byteindex))
+  String.include(
+    Module.new {
+      def byteindex(needle, offset = 0)
+        charindex = index(needle, offset)
+        slice(0...charindex).bytesize if charindex
+      end
+    }
+  )
+end

data/lib/prism/polyfill/unpack1.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Polyfill for String#unpack1 with the offset parameter. Not all Ruby engines
+# have Method#parameters implemented, so we check the arity instead if
+# necessary.
+if (unpack1 = String.instance_method(:unpack1)).respond_to?(:parameters) ? unpack1.parameters.none? { |_, name| name == :offset } : (unpack1.arity == 1)
+  String.prepend(
+    Module.new {
+      def unpack1(format, offset: 0) # :nodoc:
+        offset == 0 ? super(format) : self[offset..].unpack1(format) # steep:ignore
+      end
+    }
+  )
+end

data/lib/prism/reflection.rb

@@ -73,14 +73,16 @@ module Prism
     class OptionalLocationField < Field
     end
 
-    # A uint8 field represents an unsigned 8-bit integer value on a node. It
-    # resolves to an Integer in Ruby.
-    class UInt8Field < Field
+    # An integer field represents an integer value. It is used to represent the
+    # value of an integer literal, the depth of local variables, and the number
+    # of a numbered reference. It resolves to an Integer in Ruby.
+    class IntegerField < Field
     end
 
-    # A uint32 field represents an unsigned 32-bit integer value on a node. It
-    # resolves to an Integer in Ruby.
-    class UInt32Field < Field
+    # A float field represents a double-precision floating point value. It is
+    # used exclusively to represent the value of a floating point literal. It
+    # resolves to a Float in Ruby.
+    class FloatField < Field
     end
 
     # A flags field represents a bitset of flags on a node. It resolves to an
@@ -98,18 +100,6 @@ module Prism
       end
     end
 
-    # An integer field represents an arbitrarily-sized integer value. It is used
-    # exclusively to represent the value of an integer literal. It resolves to
-    # an Integer in Ruby.
-    class IntegerField < Field
-    end
-
-    # A double field represents a double-precision floating point value. It is
-    # used exclusively to represent the value of a floating point literal. It
-    # resolves to a Float in Ruby.
-    class DoubleField < Field
-    end
-
     # Returns the fields for the given node.
     def self.fields_for(node)
       case node.type
@@ -122,7 +112,7 @@ module Prism
       when :and_node
         [NodeField.new(:left), NodeField.new(:right), LocationField.new(:operator_loc)]
       when :arguments_node
-        [FlagsField.new(:flags, [:contains_keyword_splat?]), NodeListField.new(:arguments)]
+        [FlagsField.new(:flags, [:contains_keywords?, :contains_keyword_splat?]), NodeListField.new(:arguments)]
       when :array_node
         [FlagsField.new(:flags, [:contains_splat?]), NodeListField.new(:elements), OptionalLocationField.new(:opening_loc), OptionalLocationField.new(:closing_loc)]
       when :array_pattern_node
@@ -186,13 +176,13 @@ module Prism
       when :constant_path_and_write_node
         [NodeField.new(:target), LocationField.new(:operator_loc), NodeField.new(:value)]
       when :constant_path_node
-        [OptionalNodeField.new(:parent), NodeField.new(:child), LocationField.new(:delimiter_loc)]
+        [OptionalNodeField.new(:parent), OptionalConstantField.new(:name), LocationField.new(:delimiter_loc), LocationField.new(:name_loc)]
       when :constant_path_operator_write_node
         [NodeField.new(:target), LocationField.new(:operator_loc), NodeField.new(:value), ConstantField.new(:operator)]
       when :constant_path_or_write_node
         [NodeField.new(:target), LocationField.new(:operator_loc), NodeField.new(:value)]
       when :constant_path_target_node
-        [OptionalNodeField.new(:parent), NodeField.new(:child), LocationField.new(:delimiter_loc)]
+        [OptionalNodeField.new(:parent), OptionalConstantField.new(:name), LocationField.new(:delimiter_loc), LocationField.new(:name_loc)]
       when :constant_path_write_node
         [NodeField.new(:target), LocationField.new(:operator_loc), NodeField.new(:value)]
       when :constant_read_node
@@ -220,7 +210,7 @@ module Prism
       when :flip_flop_node
         [FlagsField.new(:flags, [:exclude_end?]), OptionalNodeField.new(:left), OptionalNodeField.new(:right), LocationField.new(:operator_loc)]
       when :float_node
-        [DoubleField.new(:value)]
+        [FloatField.new(:value)]
       when :for_node
         [NodeField.new(:index), NodeField.new(:collection), OptionalNodeField.new(:statements), LocationField.new(:for_keyword_loc), LocationField.new(:in_keyword_loc), OptionalLocationField.new(:do_keyword_loc), LocationField.new(:end_keyword_loc)]
       when :forwarding_arguments_node
@@ -296,17 +286,17 @@ module Prism
       when :lambda_node
         [ConstantListField.new(:locals), LocationField.new(:operator_loc), LocationField.new(:opening_loc), LocationField.new(:closing_loc), OptionalNodeField.new(:parameters), OptionalNodeField.new(:body)]
       when :local_variable_and_write_node
-        [LocationField.new(:name_loc), LocationField.new(:operator_loc), NodeField.new(:value), ConstantField.new(:name), UInt32Field.new(:depth)]
+        [LocationField.new(:name_loc), LocationField.new(:operator_loc), NodeField.new(:value), ConstantField.new(:name), IntegerField.new(:depth)]
       when :local_variable_operator_write_node
-        [LocationField.new(:name_loc), LocationField.new(:operator_loc), NodeField.new(:value), ConstantField.new(:name), ConstantField.new(:operator), UInt32Field.new(:depth)]
+        [LocationField.new(:name_loc), LocationField.new(:operator_loc), NodeField.new(:value), ConstantField.new(:name), ConstantField.new(:operator), IntegerField.new(:depth)]
       when :local_variable_or_write_node
-        [LocationField.new(:name_loc), LocationField.new(:operator_loc), NodeField.new(:value), ConstantField.new(:name), UInt32Field.new(:depth)]
+        [LocationField.new(:name_loc), LocationField.new(:operator_loc), NodeField.new(:value), ConstantField.new(:name), IntegerField.new(:depth)]
       when :local_variable_read_node
-        [ConstantField.new(:name), UInt32Field.new(:depth)]
+        [ConstantField.new(:name), IntegerField.new(:depth)]
       when :local_variable_target_node
-        [ConstantField.new(:name), UInt32Field.new(:depth)]
+        [ConstantField.new(:name), IntegerField.new(:depth)]
       when :local_variable_write_node
-        [ConstantField.new(:name), UInt32Field.new(:depth), LocationField.new(:name_loc), NodeField.new(:value), LocationField.new(:operator_loc)]
+        [ConstantField.new(:name), IntegerField.new(:depth), LocationField.new(:name_loc), NodeField.new(:value), LocationField.new(:operator_loc)]
       when :match_last_line_node
         [FlagsField.new(:flags, [:ignore_case?, :extended?, :multi_line?, :once?, :euc_jp?, :ascii_8bit?, :windows_31j?, :utf_8?, :forced_utf8_encoding?, :forced_binary_encoding?, :forced_us_ascii_encoding?]), LocationField.new(:opening_loc), LocationField.new(:content_loc), LocationField.new(:closing_loc), StringField.new(:unescaped)]
       when :match_predicate_node
@@ -330,9 +320,9 @@ module Prism
       when :no_keywords_parameter_node
         [LocationField.new(:operator_loc), LocationField.new(:keyword_loc)]
       when :numbered_parameters_node
-        [UInt8Field.new(:maximum)]
+        [IntegerField.new(:maximum)]
       when :numbered_reference_read_node
-        [UInt32Field.new(:number)]
+        [IntegerField.new(:number)]
       when :optional_keyword_parameter_node
         [FlagsField.new(:flags, [:repeated_parameter?]), ConstantField.new(:name), LocationField.new(:name_loc), NodeField.new(:value)]
       when :optional_parameter_node
@@ -374,7 +364,7 @@ module Prism
       when :retry_node
         []
       when :return_node
-        [LocationField.new(:keyword_loc), OptionalNodeField.new(:arguments)]
+        [FlagsField.new(:flags, [:redundant?]), LocationField.new(:keyword_loc), OptionalNodeField.new(:arguments)]
       when :self_node
         []
       when :shareable_constant_node

data/lib/prism/serialize.rb

@@ -7,7 +7,7 @@ if you are looking to modify the template
 =end
 
 require "stringio"
-require_relative "polyfill/string"
+require_relative "polyfill/unpack1"
 
 module Prism
   # A module responsible for deserializing parse results.
@@ -18,7 +18,7 @@ module Prism
 
     # The minor version of prism that we are expecting to find in the serialized
     # strings.
-    MINOR_VERSION = 26
+    MINOR_VERSION = 28
 
     # The patch version of prism that we are expecting to find in the serialized
     # strings.
@@ -27,7 +27,7 @@ module Prism
     # Deserialize the AST represented by the given string into a parse result.
     def self.load(input, serialized)
       input = input.dup
-      source = Source.new(input)
+      source = Source.for(input)
       loader = Loader.new(source, serialized)
       result = loader.load_result
 
@@ -249,17 +249,20 @@ module Prism
         :hash_rocket,
         :hash_term,
         :hash_value,
+        :heredoc_identifier,
         :heredoc_term,
         :incomplete_question_mark,
         :incomplete_variable_class,
-        :incomplete_variable_class_3_3_0,
+        :incomplete_variable_class_3_3,
         :incomplete_variable_instance,
-        :incomplete_variable_instance_3_3_0,
+        :incomplete_variable_instance_3_3,
         :instance_variable_bare,
         :invalid_block_exit,
         :invalid_character,
         :invalid_encoding_magic_comment,
         :invalid_float_exponent,
+        :invalid_local_variable_read,
+        :invalid_local_variable_write,
         :invalid_multibyte_char,
         :invalid_multibyte_character,
         :invalid_multibyte_escape,
@@ -267,14 +270,16 @@ module Prism
         :invalid_number_decimal,
         :invalid_number_hexadecimal,
         :invalid_number_octal,
-        :invalid_number_underscore,
+        :invalid_number_underscore_inner,
+        :invalid_number_underscore_trailing,
         :invalid_percent,
         :invalid_printable_character,
         :invalid_retry_after_else,
         :invalid_retry_after_ensure,
         :invalid_retry_without_rescue,
+        :invalid_symbol,
         :invalid_variable_global,
-        :invalid_variable_global_3_3_0,
+        :invalid_variable_global_3_3,
         :invalid_yield,
         :it_not_allowed_numbered,
         :it_not_allowed_ordinary,
@@ -318,6 +323,7 @@ module Prism
         :parameter_star,
         :parameter_unexpected_fwd,
         :parameter_wild_loose_comma,
+        :parameter_unexpected_no_kw,
         :pattern_capture_duplicate,
         :pattern_expression_after_bracket,
         :pattern_expression_after_comma,
@@ -332,6 +338,7 @@ module Prism
         :pattern_hash_key,
         :pattern_hash_key_duplicate,
         :pattern_hash_key_label,
+        :pattern_hash_key_locals,
         :pattern_ident_after_hrocket,
         :pattern_label_after_comma,
         :pattern_rest,
@@ -370,6 +377,9 @@ module Prism
         :unary_receiver,
         :undef_argument,
         :unexpected_block_argument,
+        :unexpected_index_block,
+        :unexpected_index_keywords,
+        :unexpected_safe_navigation,
         :unexpected_token_close_context,
         :unexpected_token_ignore,
         :until_term,
@@ -388,7 +398,7 @@ module Prism
         :comparison_after_comparison,
         :dot_dot_dot_eol,
         :equal_in_conditional,
-        :equal_in_conditional_3_3_0,
+        :equal_in_conditional_3_3,
         :end_in_method,
         :duplicated_hash_key,
         :duplicated_when_clause,
@@ -426,7 +436,7 @@ module Prism
           length = load_varuint
           lex_state = load_varuint
           location = Location.new(@source, start, length)
-          tokens << [Prism::Token.new(source, type, location.slice, location), lex_state]
+          tokens << [Token.new(source, type, location.slice, location), lex_state]
         end
 
         tokens
@@ -441,7 +451,7 @@ module Prism
         tokens.each { |token,| token.value.force_encoding(encoding) }
 
         raise "Expected to consume all bytes while deserializing" unless @io.eof?
-        Prism::ParseResult.new(tokens, comments, magic_comments, data_loc, errors, warnings, @source)
+        LexResult.new(tokens, comments, magic_comments, data_loc, errors, warnings, @source)
       end
 
       def load_nodes
@@ -460,7 +470,7 @@ module Prism
 
       def load_result
         node, comments, magic_comments, data_loc, errors, warnings = load_nodes
-        Prism::ParseResult.new(node, comments, magic_comments, data_loc, errors, warnings, @source)
+        ParseResult.new(node, comments, magic_comments, data_loc, errors, warnings, @source)
       end
 
       private
@@ -718,7 +728,7 @@ module Prism
               source, load_node, load_location, load_node, location)
           when 37 then
             ConstantPathNode.new(
-              source, load_optional_node, load_node, load_location, location)
+              source, load_optional_node, load_optional_constant, load_location, load_location, location)
           when 38 then
             ConstantPathOperatorWriteNode.new(
               source, load_node, load_location, load_node, load_required_constant, location)
@@ -727,7 +737,7 @@ module Prism
               source, load_node, load_location, load_node, location)
           when 40 then
             ConstantPathTargetNode.new(
-              source, load_optional_node, load_node, load_location, location)
+              source, load_optional_node, load_optional_constant, load_location, load_location, location)
           when 41 then
             ConstantPathWriteNode.new(
               source, load_node, load_location, load_node, location)
@@ -1001,7 +1011,7 @@ module Prism
               source, location)
           when 131 then
             ReturnNode.new(
-              source, load_location, load_optional_node, location)
+              source, load_varuint, load_location, load_optional_node, location)
           when 132 then
             SelfNode.new(
               source, location)
@@ -1253,7 +1263,7 @@ module Prism
             -> {
               location = load_location
               ConstantPathNode.new(
-                source, load_optional_node, load_node, load_location, location)
+                source, load_optional_node, load_optional_constant, load_location, load_location, location)
             },
             -> {
               location = load_location
@@ -1268,7 +1278,7 @@ module Prism
             -> {
               location = load_location
               ConstantPathTargetNode.new(
-                source, load_optional_node, load_node, load_location, location)
+                source, load_optional_node, load_optional_constant, load_location, load_location, location)
             },
             -> {
               location = load_location
@@ -1724,7 +1734,7 @@ module Prism
             -> {
               location = load_location
               ReturnNode.new(
-                source, load_location, load_optional_node, location)
+                source, load_varuint, load_location, load_optional_node, location)
             },
             -> {
               location = load_location