prism 0.17.1 → 0.19.0

data/lib/prism/serialize.rb

@@ -27,11 +27,11 @@ module Prism
 
     # The minor version of prism that we are expecting to find in the serialized
     # strings.
-    MINOR_VERSION = 17
+    MINOR_VERSION = 19
 
     # The patch version of prism that we are expecting to find in the serialized
     # strings.
-    PATCH_VERSION = 1
+    PATCH_VERSION = 0
 
     # Deserialize the AST represented by the given string into a parse result.
     def self.load(input, serialized)
@@ -80,21 +80,18 @@ module Prism
       end
 
       def load_encoding
-        Encoding.find(io.read(load_varint))
-      end
-
-      def load_force_encoding
-        @encoding = load_encoding
+        @encoding = Encoding.find(io.read(load_varuint))
         @input = input.force_encoding(@encoding).freeze
+        @encoding
       end
 
       def load_start_line
-        source.start_line = load_varint
+        source.start_line = load_varsint
       end
 
       def load_comments
-        load_varint.times.map do
-          case load_varint
+        load_varuint.times.map do
+          case load_varuint
           when 0 then InlineComment.new(load_location)
           when 1 then EmbDocComment.new(load_location)
           when 2 then DATAComment.new(load_location)
@@ -104,18 +101,19 @@ module Prism
 
       def load_metadata
         comments = load_comments
-        magic_comments = load_varint.times.map { MagicComment.new(load_location, load_location) }
-        errors = load_varint.times.map { ParseError.new(load_embedded_string, load_location) }
-        warnings = load_varint.times.map { ParseWarning.new(load_embedded_string, load_location) }
-        [comments, magic_comments, errors, warnings]
+        magic_comments = load_varuint.times.map { MagicComment.new(load_location, load_location) }
+        data_loc = load_optional_location
+        errors = load_varuint.times.map { ParseError.new(load_embedded_string, load_location) }
+        warnings = load_varuint.times.map { ParseWarning.new(load_embedded_string, load_location) }
+        [comments, magic_comments, data_loc, errors, warnings]
       end
 
       def load_tokens
         tokens = []
-        while type = TOKEN_TYPES.fetch(load_varint)
-          start = load_varint
-          length = load_varint
-          lex_state = load_varint
+        while type = TOKEN_TYPES.fetch(load_varuint)
+          start = load_varuint
+          length = load_varuint
+          lex_state = load_varuint
           location = Location.new(@source, start, length)
           tokens << [Prism::Token.new(type, location.slice, location), lex_state]
         end
@@ -127,39 +125,36 @@ module Prism
         tokens = load_tokens
         encoding = load_encoding
         load_start_line
-        comments, magic_comments, errors, warnings = load_metadata
-
-        if encoding != @encoding
-          tokens.each { |token,| token.value.force_encoding(encoding) }
-        end
+        comments, magic_comments, data_loc, errors, warnings = load_metadata
+        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, errors, warnings, @source)
+        Prism::ParseResult.new(tokens, comments, magic_comments, data_loc, errors, warnings, @source)
       end
 
       def load_nodes
         load_header
-        load_force_encoding
+        load_encoding
         load_start_line
 
-        comments, magic_comments, errors, warnings = load_metadata
+        comments, magic_comments, data_loc, errors, warnings = load_metadata
 
         @constant_pool_offset = io.read(4).unpack1("L")
-        @constant_pool = Array.new(load_varint, nil)
+        @constant_pool = Array.new(load_varuint, nil)
 
-        [load_node, comments, magic_comments, errors, warnings]
+        [load_node, comments, magic_comments, data_loc, errors, warnings]
       end
 
       def load_result
-        node, comments, magic_comments, errors, warnings = load_nodes
-        Prism::ParseResult.new(node, comments, magic_comments, errors, warnings, @source)
+        node, comments, magic_comments, data_loc, errors, warnings = load_nodes
+        Prism::ParseResult.new(node, comments, magic_comments, data_loc, errors, warnings, @source)
       end
 
       private
 
       # variable-length integer using https://en.wikipedia.org/wiki/LEB128
       # This is also what protobuf uses: https://protobuf.dev/programming-guides/encoding/#varints
-      def load_varint
+      def load_varuint
         n = io.getbyte
         if n < 128
           n
@@ -173,6 +168,11 @@ module Prism
         end
       end
 
+      def load_varsint
+        n = load_varuint
+        (n >> 1) ^ (-(n & 1))
+      end
+
       def load_serialized_length
         io.read(4).unpack1("L")
       end
@@ -185,14 +185,14 @@ module Prism
       end
 
       def load_embedded_string
-        io.read(load_varint).force_encoding(encoding)
+        io.read(load_varuint).force_encoding(encoding)
       end
 
       def load_string
         type = io.getbyte
         case type
         when 1
-          input.byteslice(load_varint, load_varint).force_encoding(encoding)
+          input.byteslice(load_varuint, load_varuint).force_encoding(encoding)
         when 2
           load_embedded_string
         else
@@ -201,7 +201,7 @@ module Prism
       end
 
       def load_location
-        Location.new(source, load_varint, load_varint)
+        Location.new(source, load_varuint, load_varuint)
       end
 
       def load_optional_location
@@ -230,11 +230,11 @@ module Prism
       end
 
       def load_required_constant
-        load_constant(load_varint - 1)
+        load_constant(load_varuint - 1)
       end
 
       def load_optional_constant
-        index = load_varint
+        index = load_varuint
         load_constant(index - 1) if index != 0
       end
 
@@ -253,11 +253,11 @@ module Prism
           when 4 then
             AndNode.new(load_node, load_node, load_location, location)
           when 5 then
-            ArgumentsNode.new(Array.new(load_varint) { load_node }, load_varint, location)
+            ArgumentsNode.new(load_varuint, Array.new(load_varuint) { load_node }, location)
           when 6 then
-            ArrayNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+            ArrayNode.new(load_varuint, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
           when 7 then
-            ArrayPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+            ArrayPatternNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
           when 8 then
             AssocNode.new(load_node, load_optional_node, load_optional_location, location)
           when 9 then
@@ -271,267 +271,275 @@ module Prism
           when 13 then
             BlockLocalVariableNode.new(load_required_constant, location)
           when 14 then
-            BlockNode.new(Array.new(load_varint) { load_required_constant }, load_optional_node, load_optional_node, load_location, load_location, location)
+            BlockNode.new(Array.new(load_varuint) { load_required_constant }, load_varuint, load_optional_node, load_optional_node, load_location, load_location, location)
           when 15 then
             BlockParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
           when 16 then
-            BlockParametersNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+            BlockParametersNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
           when 17 then
             BreakNode.new(load_optional_node, load_location, location)
           when 18 then
-            CallAndWriteNode.new(load_optional_node, load_optional_location, load_optional_location, load_varint, load_required_constant, load_required_constant, load_location, load_node, location)
+            CallAndWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_optional_location, load_required_constant, load_required_constant, load_location, load_node, location)
           when 19 then
-            CallNode.new(load_optional_node, load_optional_location, load_optional_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, load_varint, load_required_constant, location)
+            CallNode.new(load_varuint, load_optional_node, load_optional_location, load_required_constant, load_optional_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, location)
           when 20 then
-            CallOperatorWriteNode.new(load_optional_node, load_optional_location, load_optional_location, load_varint, load_required_constant, load_required_constant, load_required_constant, load_location, load_node, location)
+            CallOperatorWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_optional_location, load_required_constant, load_required_constant, load_required_constant, load_location, load_node, location)
           when 21 then
-            CallOrWriteNode.new(load_optional_node, load_optional_location, load_optional_location, load_varint, load_required_constant, load_required_constant, load_location, load_node, location)
+            CallOrWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_optional_location, load_required_constant, load_required_constant, load_location, load_node, location)
           when 22 then
-            CapturePatternNode.new(load_node, load_node, load_location, location)
+            CallTargetNode.new(load_varuint, load_node, load_location, load_required_constant, load_location, location)
           when 23 then
-            CaseNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
+            CapturePatternNode.new(load_node, load_node, load_location, location)
           when 24 then
-            ClassNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_location, load_required_constant, location)
+            CaseMatchNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_node, load_location, load_location, location)
           when 25 then
-            ClassVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            CaseNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_node, load_location, load_location, location)
           when 26 then
-            ClassVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
+            ClassNode.new(Array.new(load_varuint) { load_required_constant }, load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_location, load_required_constant, location)
           when 27 then
-            ClassVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            ClassVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 28 then
-            ClassVariableReadNode.new(load_required_constant, location)
+            ClassVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
           when 29 then
-            ClassVariableTargetNode.new(load_required_constant, location)
+            ClassVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 30 then
-            ClassVariableWriteNode.new(load_required_constant, load_location, load_node, load_optional_location, location)
+            ClassVariableReadNode.new(load_required_constant, location)
           when 31 then
-            ConstantAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            ClassVariableTargetNode.new(load_required_constant, location)
           when 32 then
-            ConstantOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
+            ClassVariableWriteNode.new(load_required_constant, load_location, load_node, load_optional_location, location)
           when 33 then
-            ConstantOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            ConstantAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 34 then
-            ConstantPathAndWriteNode.new(load_node, load_location, load_node, location)
+            ConstantOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
           when 35 then
-            ConstantPathNode.new(load_optional_node, load_node, load_location, location)
+            ConstantOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 36 then
-            ConstantPathOperatorWriteNode.new(load_node, load_location, load_node, load_required_constant, location)
+            ConstantPathAndWriteNode.new(load_node, load_location, load_node, location)
           when 37 then
-            ConstantPathOrWriteNode.new(load_node, load_location, load_node, location)
+            ConstantPathNode.new(load_optional_node, load_node, load_location, location)
           when 38 then
-            ConstantPathTargetNode.new(load_optional_node, load_node, load_location, location)
+            ConstantPathOperatorWriteNode.new(load_node, load_location, load_node, load_required_constant, location)
           when 39 then
-            ConstantPathWriteNode.new(load_node, load_location, load_node, location)
+            ConstantPathOrWriteNode.new(load_node, load_location, load_node, location)
           when 40 then
-            ConstantReadNode.new(load_required_constant, location)
+            ConstantPathTargetNode.new(load_optional_node, load_node, load_location, location)
           when 41 then
-            ConstantTargetNode.new(load_required_constant, location)
+            ConstantPathWriteNode.new(load_node, load_location, load_node, location)
           when 42 then
-            ConstantWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
+            ConstantReadNode.new(load_required_constant, location)
           when 43 then
-            load_serialized_length
-            DefNode.new(load_required_constant, load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varint) { load_required_constant }, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
+            ConstantTargetNode.new(load_required_constant, location)
           when 44 then
-            DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
+            ConstantWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
           when 45 then
-            ElseNode.new(load_location, load_optional_node, load_optional_location, location)
+            load_serialized_length
+            DefNode.new(load_required_constant, load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varuint) { load_required_constant }, load_varuint, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
           when 46 then
-            EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
+            DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
           when 47 then
-            EmbeddedVariableNode.new(load_location, load_node, location)
+            ElseNode.new(load_location, load_optional_node, load_optional_location, location)
           when 48 then
-            EnsureNode.new(load_location, load_optional_node, load_location, location)
+            EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
           when 49 then
-            FalseNode.new(location)
+            EmbeddedVariableNode.new(load_location, load_node, location)
           when 50 then
-            FindPatternNode.new(load_optional_node, load_node, Array.new(load_varint) { load_node }, load_node, load_optional_location, load_optional_location, location)
+            EnsureNode.new(load_location, load_optional_node, load_location, location)
           when 51 then
-            FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+            FalseNode.new(location)
           when 52 then
-            FloatNode.new(location)
+            FindPatternNode.new(load_optional_node, load_node, Array.new(load_varuint) { load_node }, load_node, load_optional_location, load_optional_location, location)
           when 53 then
-            ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
+            FlipFlopNode.new(load_varuint, load_optional_node, load_optional_node, load_location, location)
           when 54 then
-            ForwardingArgumentsNode.new(location)
+            FloatNode.new(location)
           when 55 then
-            ForwardingParameterNode.new(location)
+            ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
           when 56 then
-            ForwardingSuperNode.new(load_optional_node, location)
+            ForwardingArgumentsNode.new(location)
           when 57 then
-            GlobalVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            ForwardingParameterNode.new(location)
           when 58 then
-            GlobalVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
+            ForwardingSuperNode.new(load_optional_node, location)
           when 59 then
-            GlobalVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            GlobalVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 60 then
-            GlobalVariableReadNode.new(load_required_constant, location)
+            GlobalVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
           when 61 then
-            GlobalVariableTargetNode.new(load_required_constant, location)
+            GlobalVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 62 then
-            GlobalVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
+            GlobalVariableReadNode.new(load_required_constant, location)
           when 63 then
-            HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+            GlobalVariableTargetNode.new(load_required_constant, location)
           when 64 then
-            HashPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
+            GlobalVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
           when 65 then
-            IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+            HashNode.new(load_location, Array.new(load_varuint) { load_node }, load_location, location)
           when 66 then
-            ImaginaryNode.new(load_node, location)
+            HashPatternNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
           when 67 then
-            ImplicitNode.new(load_node, location)
+            IfNode.new(load_optional_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_optional_location, location)
           when 68 then
-            InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
+            ImaginaryNode.new(load_node, location)
           when 69 then
-            IndexAndWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_location, load_node, location)
+            ImplicitNode.new(load_node, location)
           when 70 then
-            IndexOperatorWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_required_constant, load_location, load_node, location)
+            ImplicitRestNode.new(location)
           when 71 then
-            IndexOrWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_location, load_node, location)
+            InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
           when 72 then
-            InstanceVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            IndexAndWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_location, load_node, location)
           when 73 then
-            InstanceVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
+            IndexOperatorWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_required_constant, load_location, load_node, location)
           when 74 then
-            InstanceVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            IndexOrWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_location, load_node, location)
           when 75 then
-            InstanceVariableReadNode.new(load_required_constant, location)
+            IndexTargetNode.new(load_varuint, load_node, load_location, load_optional_node, load_location, load_optional_node, location)
           when 76 then
-            InstanceVariableTargetNode.new(load_required_constant, location)
+            InstanceVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 77 then
-            InstanceVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
+            InstanceVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
           when 78 then
-            IntegerNode.new(load_varint, location)
+            InstanceVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 79 then
-            InterpolatedMatchLastLineNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
+            InstanceVariableReadNode.new(load_required_constant, location)
           when 80 then
-            InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
+            InstanceVariableTargetNode.new(load_required_constant, location)
           when 81 then
-            InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+            InstanceVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
           when 82 then
-            InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+            IntegerNode.new(load_varuint, location)
           when 83 then
-            InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+            InterpolatedMatchLastLineNode.new(load_varuint, load_location, Array.new(load_varuint) { load_node }, load_location, location)
           when 84 then
-            KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
+            InterpolatedRegularExpressionNode.new(load_varuint, load_location, Array.new(load_varuint) { load_node }, load_location, location)
           when 85 then
-            KeywordRestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+            InterpolatedStringNode.new(load_optional_location, Array.new(load_varuint) { load_node }, load_optional_location, location)
           when 86 then
-            LambdaNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
+            InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varuint) { load_node }, load_optional_location, location)
           when 87 then
-            LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
+            InterpolatedXStringNode.new(load_location, Array.new(load_varuint) { load_node }, load_location, location)
           when 88 then
-            LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_required_constant, load_required_constant, load_varint, location)
+            KeywordHashNode.new(load_varuint, Array.new(load_varuint) { load_node }, location)
           when 89 then
-            LocalVariableOrWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
+            KeywordRestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
           when 90 then
-            LocalVariableReadNode.new(load_required_constant, load_varint, location)
+            LambdaNode.new(Array.new(load_varuint) { load_required_constant }, load_varuint, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
           when 91 then
-            LocalVariableTargetNode.new(load_required_constant, load_varint, location)
+            LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varuint, location)
           when 92 then
-            LocalVariableWriteNode.new(load_required_constant, load_varint, load_location, load_node, load_location, location)
+            LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_required_constant, load_required_constant, load_varuint, location)
           when 93 then
-            MatchLastLineNode.new(load_location, load_location, load_location, load_string, load_varint, location)
+            LocalVariableOrWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varuint, location)
           when 94 then
-            MatchPredicateNode.new(load_node, load_node, load_location, location)
+            LocalVariableReadNode.new(load_required_constant, load_varuint, location)
           when 95 then
-            MatchRequiredNode.new(load_node, load_node, load_location, location)
+            LocalVariableTargetNode.new(load_required_constant, load_varuint, location)
           when 96 then
-            MatchWriteNode.new(load_node, Array.new(load_varint) { load_required_constant }, location)
+            LocalVariableWriteNode.new(load_required_constant, load_varuint, load_location, load_node, load_location, location)
           when 97 then
-            MissingNode.new(location)
+            MatchLastLineNode.new(load_varuint, load_location, load_location, load_location, load_string, location)
           when 98 then
-            ModuleNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_node, load_optional_node, load_location, load_required_constant, location)
+            MatchPredicateNode.new(load_node, load_node, load_location, location)
           when 99 then
-            MultiTargetNode.new(Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+            MatchRequiredNode.new(load_node, load_node, load_location, location)
           when 100 then
-            MultiWriteNode.new(Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, load_location, load_node, location)
+            MatchWriteNode.new(load_node, Array.new(load_varuint) { load_node }, location)
           when 101 then
-            NextNode.new(load_optional_node, load_location, location)
+            MissingNode.new(location)
           when 102 then
-            NilNode.new(location)
+            ModuleNode.new(Array.new(load_varuint) { load_required_constant }, load_location, load_node, load_optional_node, load_location, load_required_constant, location)
           when 103 then
-            NoKeywordsParameterNode.new(load_location, load_location, location)
+            MultiTargetNode.new(Array.new(load_varuint) { load_node }, load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
           when 104 then
-            NumberedReferenceReadNode.new(load_varint, location)
+            MultiWriteNode.new(Array.new(load_varuint) { load_node }, load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, load_location, load_node, location)
           when 105 then
-            OptionalKeywordParameterNode.new(load_required_constant, load_location, load_node, location)
+            NextNode.new(load_optional_node, load_location, location)
           when 106 then
-            OptionalParameterNode.new(load_required_constant, load_location, load_location, load_node, location)
+            NilNode.new(location)
           when 107 then
-            OrNode.new(load_node, load_node, load_location, location)
+            NoKeywordsParameterNode.new(load_location, load_location, location)
           when 108 then
-            ParametersNode.new(Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, load_optional_node, location)
+            NumberedParametersNode.new(io.getbyte, location)
           when 109 then
-            ParenthesesNode.new(load_optional_node, load_location, load_location, location)
+            NumberedReferenceReadNode.new(load_varuint, location)
           when 110 then
-            PinnedExpressionNode.new(load_node, load_location, load_location, load_location, location)
+            OptionalKeywordParameterNode.new(load_required_constant, load_location, load_node, location)
           when 111 then
-            PinnedVariableNode.new(load_node, load_location, location)
+            OptionalParameterNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 112 then
-            PostExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
+            OrNode.new(load_node, load_node, load_location, location)
           when 113 then
-            PreExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
+            ParametersNode.new(Array.new(load_varuint) { load_node }, Array.new(load_varuint) { load_node }, load_optional_node, Array.new(load_varuint) { load_node }, Array.new(load_varuint) { load_node }, load_optional_node, load_optional_node, location)
           when 114 then
-            ProgramNode.new(Array.new(load_varint) { load_required_constant }, load_node, location)
+            ParenthesesNode.new(load_optional_node, load_location, load_location, location)
           when 115 then
-            RangeNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+            PinnedExpressionNode.new(load_node, load_location, load_location, load_location, location)
           when 116 then
-            RationalNode.new(load_node, location)
+            PinnedVariableNode.new(load_node, load_location, location)
           when 117 then
-            RedoNode.new(location)
+            PostExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
           when 118 then
-            RegularExpressionNode.new(load_location, load_location, load_location, load_string, load_varint, location)
+            PreExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
           when 119 then
-            RequiredKeywordParameterNode.new(load_required_constant, load_location, location)
+            ProgramNode.new(Array.new(load_varuint) { load_required_constant }, load_node, location)
           when 120 then
-            RequiredParameterNode.new(load_required_constant, location)
+            RangeNode.new(load_varuint, load_optional_node, load_optional_node, load_location, location)
           when 121 then
-            RescueModifierNode.new(load_node, load_location, load_node, location)
+            RationalNode.new(load_node, location)
           when 122 then
-            RescueNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
+            RedoNode.new(location)
           when 123 then
-            RestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+            RegularExpressionNode.new(load_varuint, load_location, load_location, load_location, load_string, location)
           when 124 then
-            RetryNode.new(location)
+            RequiredKeywordParameterNode.new(load_required_constant, load_location, location)
           when 125 then
-            ReturnNode.new(load_location, load_optional_node, location)
+            RequiredParameterNode.new(load_required_constant, location)
           when 126 then
-            SelfNode.new(location)
+            RescueModifierNode.new(load_node, load_location, load_node, location)
           when 127 then
-            SingletonClassNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
+            RescueNode.new(load_location, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
           when 128 then
-            SourceEncodingNode.new(location)
+            RestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
           when 129 then
-            SourceFileNode.new(load_string, location)
+            RetryNode.new(location)
           when 130 then
-            SourceLineNode.new(location)
+            ReturnNode.new(load_location, load_optional_node, location)
           when 131 then
-            SplatNode.new(load_location, load_optional_node, location)
+            SelfNode.new(location)
           when 132 then
-            StatementsNode.new(Array.new(load_varint) { load_node }, location)
+            SingletonClassNode.new(Array.new(load_varuint) { load_required_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
           when 133 then
-            StringConcatNode.new(load_node, load_node, location)
+            SourceEncodingNode.new(location)
           when 134 then
-            StringNode.new(load_varint, load_optional_location, load_location, load_optional_location, load_string, location)
+            SourceFileNode.new(load_string, location)
           when 135 then
-            SuperNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, location)
+            SourceLineNode.new(location)
           when 136 then
-            SymbolNode.new(load_optional_location, load_optional_location, load_optional_location, load_string, location)
+            SplatNode.new(load_location, load_optional_node, location)
           when 137 then
-            TrueNode.new(location)
+            StatementsNode.new(Array.new(load_varuint) { load_node }, location)
           when 138 then
-            UndefNode.new(Array.new(load_varint) { load_node }, load_location, location)
+            StringNode.new(load_varuint, load_optional_location, load_location, load_optional_location, load_string, location)
           when 139 then
-            UnlessNode.new(load_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+            SuperNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, location)
           when 140 then
-            UntilNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
+            SymbolNode.new(load_varuint, load_optional_location, load_optional_location, load_optional_location, load_string, location)
           when 141 then
-            WhenNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_node, location)
+            TrueNode.new(location)
           when 142 then
-            WhileNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
+            UndefNode.new(Array.new(load_varuint) { load_node }, load_location, location)
           when 143 then
-            XStringNode.new(load_location, load_location, load_location, load_string, location)
+            UnlessNode.new(load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_optional_location, location)
           when 144 then
+            UntilNode.new(load_varuint, load_location, load_optional_location, load_node, load_optional_node, location)
+          when 145 then
+            WhenNode.new(load_location, Array.new(load_varuint) { load_node }, load_optional_node, location)
+          when 146 then
+            WhileNode.new(load_varuint, load_location, load_optional_location, load_node, load_optional_node, location)
+          when 147 then
+            XStringNode.new(load_varuint, load_location, load_location, load_location, load_string, location)
+          when 148 then
             YieldNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, location)
           end
         end
@@ -562,15 +570,15 @@ module Prism
             },
             -> {
               location = load_location
-              ArgumentsNode.new(Array.new(load_varint) { load_node }, load_varint, location)
+              ArgumentsNode.new(load_varuint, Array.new(load_varuint) { load_node }, location)
             },
             -> {
               location = load_location
-              ArrayNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+              ArrayNode.new(load_varuint, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
             },
             -> {
               location = load_location
-              ArrayPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+              ArrayPatternNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
             },
             -> {
               location = load_location
@@ -598,7 +606,7 @@ module Prism
             },
             -> {
               location = load_location
-              BlockNode.new(Array.new(load_varint) { load_required_constant }, load_optional_node, load_optional_node, load_location, load_location, location)
+              BlockNode.new(Array.new(load_varuint) { load_required_constant }, load_varuint, load_optional_node, load_optional_node, load_location, load_location, location)
             },
             -> {
               location = load_location
@@ -606,7 +614,7 @@ module Prism
             },
             -> {
               location = load_location
-              BlockParametersNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+              BlockParametersNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
             },
             -> {
               location = load_location
@@ -614,19 +622,23 @@ module Prism
             },
             -> {
               location = load_location
-              CallAndWriteNode.new(load_optional_node, load_optional_location, load_optional_location, load_varint, load_required_constant, load_required_constant, load_location, load_node, location)
+              CallAndWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_optional_location, load_required_constant, load_required_constant, load_location, load_node, location)
             },
             -> {
               location = load_location
-              CallNode.new(load_optional_node, load_optional_location, load_optional_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, load_varint, load_required_constant, location)
+              CallNode.new(load_varuint, load_optional_node, load_optional_location, load_required_constant, load_optional_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, location)
             },
             -> {
               location = load_location
-              CallOperatorWriteNode.new(load_optional_node, load_optional_location, load_optional_location, load_varint, load_required_constant, load_required_constant, load_required_constant, load_location, load_node, location)
+              CallOperatorWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_optional_location, load_required_constant, load_required_constant, load_required_constant, load_location, load_node, location)
             },
             -> {
               location = load_location
-              CallOrWriteNode.new(load_optional_node, load_optional_location, load_optional_location, load_varint, load_required_constant, load_required_constant, load_location, load_node, location)
+              CallOrWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_optional_location, load_required_constant, load_required_constant, load_location, load_node, location)
+            },
+            -> {
+              location = load_location
+              CallTargetNode.new(load_varuint, load_node, load_location, load_required_constant, load_location, location)
             },
             -> {
               location = load_location
@@ -634,11 +646,15 @@ module Prism
             },
             -> {
               location = load_location
-              CaseNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
+              CaseMatchNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_node, load_location, load_location, location)
             },
             -> {
               location = load_location
-              ClassNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_location, load_required_constant, location)
+              CaseNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_node, load_location, load_location, location)
+            },
+            -> {
+              location = load_location
+              ClassNode.new(Array.new(load_varuint) { load_required_constant }, load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_location, load_required_constant, location)
             },
             -> {
               location = load_location
@@ -715,7 +731,7 @@ module Prism
             -> {
               location = load_location
               load_serialized_length
-              DefNode.new(load_required_constant, load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varint) { load_required_constant }, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
+              DefNode.new(load_required_constant, load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varuint) { load_required_constant }, load_varuint, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
             },
             -> {
               location = load_location
@@ -743,11 +759,11 @@ module Prism
             },
             -> {
               location = load_location
-              FindPatternNode.new(load_optional_node, load_node, Array.new(load_varint) { load_node }, load_node, load_optional_location, load_optional_location, location)
+              FindPatternNode.new(load_optional_node, load_node, Array.new(load_varuint) { load_node }, load_node, load_optional_location, load_optional_location, location)
             },
             -> {
               location = load_location
-              FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+              FlipFlopNode.new(load_varuint, load_optional_node, load_optional_node, load_location, location)
             },
             -> {
               location = load_location
@@ -795,15 +811,15 @@ module Prism
             },
             -> {
               location = load_location
-              HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+              HashNode.new(load_location, Array.new(load_varuint) { load_node }, load_location, location)
             },
             -> {
               location = load_location
-              HashPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
+              HashPatternNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
             },
             -> {
               location = load_location
-              IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+              IfNode.new(load_optional_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_optional_location, location)
             },
             -> {
               location = load_location
@@ -813,21 +829,29 @@ module Prism
               location = load_location
               ImplicitNode.new(load_node, location)
             },
+            -> {
+              location = load_location
+              ImplicitRestNode.new(location)
+            },
             -> {
               location = load_location
               InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
             },
             -> {
               location = load_location
-              IndexAndWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_location, load_node, location)
+              IndexAndWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_location, load_node, location)
+            },
+            -> {
+              location = load_location
+              IndexOperatorWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_required_constant, load_location, load_node, location)
             },
             -> {
               location = load_location
-              IndexOperatorWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_required_constant, load_location, load_node, location)
+              IndexOrWriteNode.new(load_varuint, load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_location, load_node, location)
             },
             -> {
               location = load_location
-              IndexOrWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_location, load_node, location)
+              IndexTargetNode.new(load_varuint, load_node, load_location, load_optional_node, load_location, load_optional_node, location)
             },
             -> {
               location = load_location
@@ -855,31 +879,31 @@ module Prism
             },
             -> {
               location = load_location
-              IntegerNode.new(load_varint, location)
+              IntegerNode.new(load_varuint, location)
             },
             -> {
               location = load_location
-              InterpolatedMatchLastLineNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
+              InterpolatedMatchLastLineNode.new(load_varuint, load_location, Array.new(load_varuint) { load_node }, load_location, location)
             },
             -> {
               location = load_location
-              InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
+              InterpolatedRegularExpressionNode.new(load_varuint, load_location, Array.new(load_varuint) { load_node }, load_location, location)
             },
             -> {
               location = load_location
-              InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+              InterpolatedStringNode.new(load_optional_location, Array.new(load_varuint) { load_node }, load_optional_location, location)
             },
             -> {
               location = load_location
-              InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+              InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varuint) { load_node }, load_optional_location, location)
             },
             -> {
               location = load_location
-              InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+              InterpolatedXStringNode.new(load_location, Array.new(load_varuint) { load_node }, load_location, location)
             },
             -> {
               location = load_location
-              KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
+              KeywordHashNode.new(load_varuint, Array.new(load_varuint) { load_node }, location)
             },
             -> {
               location = load_location
@@ -887,35 +911,35 @@ module Prism
             },
             -> {
               location = load_location
-              LambdaNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
+              LambdaNode.new(Array.new(load_varuint) { load_required_constant }, load_varuint, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
             },
             -> {
               location = load_location
-              LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
+              LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varuint, location)
             },
             -> {
               location = load_location
-              LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_required_constant, load_required_constant, load_varint, location)
+              LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_required_constant, load_required_constant, load_varuint, location)
             },
             -> {
               location = load_location
-              LocalVariableOrWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
+              LocalVariableOrWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varuint, location)
             },
             -> {
               location = load_location
-              LocalVariableReadNode.new(load_required_constant, load_varint, location)
+              LocalVariableReadNode.new(load_required_constant, load_varuint, location)
             },
             -> {
               location = load_location
-              LocalVariableTargetNode.new(load_required_constant, load_varint, location)
+              LocalVariableTargetNode.new(load_required_constant, load_varuint, location)
             },
             -> {
               location = load_location
-              LocalVariableWriteNode.new(load_required_constant, load_varint, load_location, load_node, load_location, location)
+              LocalVariableWriteNode.new(load_required_constant, load_varuint, load_location, load_node, load_location, location)
             },
             -> {
               location = load_location
-              MatchLastLineNode.new(load_location, load_location, load_location, load_string, load_varint, location)
+              MatchLastLineNode.new(load_varuint, load_location, load_location, load_location, load_string, location)
             },
             -> {
               location = load_location
@@ -927,7 +951,7 @@ module Prism
             },
             -> {
               location = load_location
-              MatchWriteNode.new(load_node, Array.new(load_varint) { load_required_constant }, location)
+              MatchWriteNode.new(load_node, Array.new(load_varuint) { load_node }, location)
             },
             -> {
               location = load_location
@@ -935,15 +959,15 @@ module Prism
             },
             -> {
               location = load_location
-              ModuleNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_node, load_optional_node, load_location, load_required_constant, location)
+              ModuleNode.new(Array.new(load_varuint) { load_required_constant }, load_location, load_node, load_optional_node, load_location, load_required_constant, location)
             },
             -> {
               location = load_location
-              MultiTargetNode.new(Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+              MultiTargetNode.new(Array.new(load_varuint) { load_node }, load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
             },
             -> {
               location = load_location
-              MultiWriteNode.new(Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, load_location, load_node, location)
+              MultiWriteNode.new(Array.new(load_varuint) { load_node }, load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, load_location, load_node, location)
             },
             -> {
               location = load_location
@@ -959,7 +983,11 @@ module Prism
             },
             -> {
               location = load_location
-              NumberedReferenceReadNode.new(load_varint, location)
+              NumberedParametersNode.new(io.getbyte, location)
+            },
+            -> {
+              location = load_location
+              NumberedReferenceReadNode.new(load_varuint, location)
             },
             -> {
               location = load_location
@@ -975,7 +1003,7 @@ module Prism
             },
             -> {
               location = load_location
-              ParametersNode.new(Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, load_optional_node, location)
+              ParametersNode.new(Array.new(load_varuint) { load_node }, Array.new(load_varuint) { load_node }, load_optional_node, Array.new(load_varuint) { load_node }, Array.new(load_varuint) { load_node }, load_optional_node, load_optional_node, location)
             },
             -> {
               location = load_location
@@ -999,11 +1027,11 @@ module Prism
             },
             -> {
               location = load_location
-              ProgramNode.new(Array.new(load_varint) { load_required_constant }, load_node, location)
+              ProgramNode.new(Array.new(load_varuint) { load_required_constant }, load_node, location)
             },
             -> {
               location = load_location
-              RangeNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+              RangeNode.new(load_varuint, load_optional_node, load_optional_node, load_location, location)
             },
             -> {
               location = load_location
@@ -1015,7 +1043,7 @@ module Prism
             },
             -> {
               location = load_location
-              RegularExpressionNode.new(load_location, load_location, load_location, load_string, load_varint, location)
+              RegularExpressionNode.new(load_varuint, load_location, load_location, load_location, load_string, location)
             },
             -> {
               location = load_location
@@ -1031,7 +1059,7 @@ module Prism
             },
             -> {
               location = load_location
-              RescueNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
+              RescueNode.new(load_location, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
             },
             -> {
               location = load_location
@@ -1051,7 +1079,7 @@ module Prism
             },
             -> {
               location = load_location
-              SingletonClassNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
+              SingletonClassNode.new(Array.new(load_varuint) { load_required_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
             },
             -> {
               location = load_location
@@ -1071,15 +1099,11 @@ module Prism
             },
             -> {
               location = load_location
-              StatementsNode.new(Array.new(load_varint) { load_node }, location)
-            },
-            -> {
-              location = load_location
-              StringConcatNode.new(load_node, load_node, location)
+              StatementsNode.new(Array.new(load_varuint) { load_node }, location)
             },
             -> {
               location = load_location
-              StringNode.new(load_varint, load_optional_location, load_location, load_optional_location, load_string, location)
+              StringNode.new(load_varuint, load_optional_location, load_location, load_optional_location, load_string, location)
             },
             -> {
               location = load_location
@@ -1087,7 +1111,7 @@ module Prism
             },
             -> {
               location = load_location
-              SymbolNode.new(load_optional_location, load_optional_location, load_optional_location, load_string, location)
+              SymbolNode.new(load_varuint, load_optional_location, load_optional_location, load_optional_location, load_string, location)
             },
             -> {
               location = load_location
@@ -1095,27 +1119,27 @@ module Prism
             },
             -> {
               location = load_location
-              UndefNode.new(Array.new(load_varint) { load_node }, load_location, location)
+              UndefNode.new(Array.new(load_varuint) { load_node }, load_location, location)
             },
             -> {
               location = load_location
-              UnlessNode.new(load_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+              UnlessNode.new(load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_optional_location, location)
             },
             -> {
               location = load_location
-              UntilNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
+              UntilNode.new(load_varuint, load_location, load_optional_location, load_node, load_optional_node, location)
             },
             -> {
               location = load_location
-              WhenNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_node, location)
+              WhenNode.new(load_location, Array.new(load_varuint) { load_node }, load_optional_node, location)
             },
             -> {
               location = load_location
-              WhileNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
+              WhileNode.new(load_varuint, load_location, load_optional_location, load_node, load_optional_node, location)
             },
             -> {
               location = load_location
-              XStringNode.new(load_location, load_location, load_location, load_string, location)
+              XStringNode.new(load_varuint, load_location, load_location, load_location, load_string, location)
             },
             -> {
               location = load_location