yarp 0.7.0 → 0.9.0

data/lib/yarp/serialize.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 =begin
-This file is generated by the bin/template script and should not be
+This file is generated by the templates/template.rb script and should not be
 modified manually. See templates/lib/yarp/serialize.rb.erb
 if you are looking to modify the template
 =end
@@ -21,15 +21,15 @@ end
 module YARP
   module Serialize
     MAJOR_VERSION = 0
-    MINOR_VERSION = 7
+    MINOR_VERSION = 9
     PATCH_VERSION = 0
 
     def self.load(input, serialized)
-      Loader.new(Source.new(input), serialized).load
+      Loader.new(Source.new(input), serialized).load_result
     end
 
     def self.load_tokens(source, serialized)
-      Loader.new(source, serialized).load_tokens
+      Loader.new(source, serialized).load_tokens_result
     end
 
     class Loader
@@ -50,6 +50,17 @@ module YARP
         @source = source
       end
 
+      def load_encoding
+        Encoding.find(io.read(load_varint))
+      end
+
+      def load_metadata
+        comments = load_varint.times.map { Comment.new(Comment::TYPES.fetch(load_varint), 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, errors, warnings]
+      end
+
       def load_tokens
         tokens = []
         while type = TOKEN_TYPES.fetch(load_varint)
@@ -60,32 +71,40 @@ module YARP
           tokens << [YARP::Token.new(type, location.slice, location), lex_state]
         end
 
-        comments = load_varint.times.map { Comment.new(Comment::TYPES.fetch(load_varint), load_location) }
-        errors = load_varint.times.map { ParseError.new(load_string, load_location) }
-        warnings = load_varint.times.map { ParseWarning.new(load_string, load_location) }
+        tokens
+      end
 
-        raise "Expected to consume all bytes while deserializing" unless @io.eof?
+      def load_tokens_result
+        tokens = load_tokens
+        encoding = load_encoding
+        comments, errors, warnings = load_metadata
+
+        if encoding != @encoding
+          tokens.each { |token,| token.value.force_encoding(encoding) }
+        end
 
+        raise "Expected to consume all bytes while deserializing" unless @io.eof?
         YARP::ParseResult.new(tokens, comments, errors, warnings, @source)
       end
 
-      def load
+      def load_nodes
         raise "Invalid serialization" if io.read(4) != "YARP"
         raise "Invalid serialization" if io.read(3).unpack("C3") != [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION]
 
-        @encoding = Encoding.find(io.read(load_varint))
+        @encoding = load_encoding
         @input = input.force_encoding(@encoding).freeze
 
-        comments = load_varint.times.map { Comment.new(Comment::TYPES.fetch(io.getbyte), load_location) }
-        errors = load_varint.times.map { ParseError.new(load_string, load_location) }
-        warnings = load_varint.times.map { ParseWarning.new(load_string, load_location) }
+        comments, errors, warnings = load_metadata
 
         @constant_pool_offset = io.read(4).unpack1("L")
         @constant_pool = Array.new(load_varint, nil)
 
-        ast = load_node
+        [load_node, comments, errors, warnings]
+      end
 
-        YARP::ParseResult.new(ast, comments, errors, warnings, @source)
+      def load_result
+        node, comments, errors, warnings = load_nodes
+        YARP::ParseResult.new(node, comments, errors, warnings, @source)
       end
 
       private
@@ -117,10 +136,21 @@ module YARP
         end
       end
 
-      def load_string
+      def load_embedded_string
         io.read(load_varint).force_encoding(encoding)
       end
 
+      def load_string
+        case io.getbyte
+        when 1
+          input.byteslice(load_varint, load_varint).force_encoding(encoding)
+        when 2
+          load_embedded_string
+        else
+          raise
+        end
+      end
+
       def load_location
         Location.new(source, load_varint, load_varint)
       end
@@ -194,219 +224,231 @@ module YARP
         when 21 then
           CaseNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
         when 22 then
-          ClassNode.new(Array.new(load_varint) { load_constant }, load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_location, location)
+          ClassNode.new(Array.new(load_varint) { load_constant }, load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_location, load_string, location)
         when 23 then
-          ClassVariableOperatorAndWriteNode.new(load_location, load_location, load_node, location)
+          ClassVariableAndWriteNode.new(load_location, load_location, load_node, location)
         when 24 then
-          ClassVariableOperatorOrWriteNode.new(load_location, load_location, load_node, location)
-        when 25 then
           ClassVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
+        when 25 then
+          ClassVariableOrWriteNode.new(load_location, load_location, load_node, location)
         when 26 then
           ClassVariableReadNode.new(location)
         when 27 then
-          ClassVariableWriteNode.new(load_location, load_optional_node, load_optional_location, location)
+          ClassVariableTargetNode.new(location)
         when 28 then
-          ConstantOperatorAndWriteNode.new(load_location, load_location, load_node, location)
+          ClassVariableWriteNode.new(load_location, load_optional_node, load_optional_location, location)
         when 29 then
-          ConstantOperatorOrWriteNode.new(load_location, load_location, load_node, location)
+          ConstantAndWriteNode.new(load_location, load_location, load_node, location)
         when 30 then
           ConstantOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
         when 31 then
-          ConstantPathNode.new(load_optional_node, load_node, load_location, location)
+          ConstantOrWriteNode.new(load_location, load_location, load_node, location)
         when 32 then
-          ConstantPathOperatorAndWriteNode.new(load_node, load_location, load_node, location)
+          ConstantPathAndWriteNode.new(load_node, load_location, load_node, location)
         when 33 then
-          ConstantPathOperatorOrWriteNode.new(load_node, load_location, load_node, location)
+          ConstantPathNode.new(load_optional_node, load_node, load_location, location)
         when 34 then
           ConstantPathOperatorWriteNode.new(load_node, load_location, load_node, load_constant, location)
         when 35 then
-          ConstantPathWriteNode.new(load_node, load_optional_location, load_optional_node, location)
+          ConstantPathOrWriteNode.new(load_node, load_location, load_node, location)
         when 36 then
-          ConstantReadNode.new(location)
+          ConstantPathTargetNode.new(load_optional_node, load_node, load_location, location)
         when 37 then
-          ConstantWriteNode.new(load_location, load_optional_node, load_optional_location, location)
+          ConstantPathWriteNode.new(load_node, load_location, load_node, location)
         when 38 then
-          load_serialized_length
-          DefNode.new(load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varint) { load_constant }, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
+          ConstantReadNode.new(location)
         when 39 then
-          DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
+          ConstantTargetNode.new(location)
         when 40 then
-          ElseNode.new(load_location, load_optional_node, load_optional_location, location)
+          ConstantWriteNode.new(load_location, load_node, load_location, location)
         when 41 then
-          EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
+          load_serialized_length
+          DefNode.new(load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varint) { load_constant }, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
         when 42 then
-          EmbeddedVariableNode.new(load_location, load_node, location)
+          DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
         when 43 then
-          EnsureNode.new(load_location, load_optional_node, load_location, location)
+          ElseNode.new(load_location, load_optional_node, load_optional_location, location)
         when 44 then
-          FalseNode.new(location)
+          EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
         when 45 then
-          FindPatternNode.new(load_optional_node, load_node, Array.new(load_varint) { load_node }, load_node, load_optional_location, load_optional_location, location)
+          EmbeddedVariableNode.new(load_location, load_node, location)
         when 46 then
-          FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+          EnsureNode.new(load_location, load_optional_node, load_location, location)
         when 47 then
-          FloatNode.new(location)
+          FalseNode.new(location)
         when 48 then
-          ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
+          FindPatternNode.new(load_optional_node, load_node, Array.new(load_varint) { load_node }, load_node, load_optional_location, load_optional_location, location)
         when 49 then
-          ForwardingArgumentsNode.new(location)
+          FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
         when 50 then
-          ForwardingParameterNode.new(location)
+          FloatNode.new(location)
         when 51 then
-          ForwardingSuperNode.new(load_optional_node, location)
+          ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
         when 52 then
-          GlobalVariableOperatorAndWriteNode.new(load_location, load_location, load_node, location)
+          ForwardingArgumentsNode.new(location)
         when 53 then
-          GlobalVariableOperatorOrWriteNode.new(load_location, load_location, load_node, location)
+          ForwardingParameterNode.new(location)
         when 54 then
-          GlobalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          ForwardingSuperNode.new(load_optional_node, location)
         when 55 then
-          GlobalVariableReadNode.new(location)
+          GlobalVariableAndWriteNode.new(load_location, load_location, load_node, location)
         when 56 then
-          GlobalVariableWriteNode.new(load_location, load_optional_location, load_optional_node, location)
+          GlobalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
         when 57 then
-          HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+          GlobalVariableOrWriteNode.new(load_location, load_location, load_node, location)
         when 58 then
-          HashPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
+          GlobalVariableReadNode.new(location)
         when 59 then
-          IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+          GlobalVariableTargetNode.new(location)
         when 60 then
-          ImaginaryNode.new(load_node, location)
+          GlobalVariableWriteNode.new(load_location, load_location, load_node, location)
         when 61 then
-          InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
+          HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
         when 62 then
-          InstanceVariableOperatorAndWriteNode.new(load_location, load_location, load_node, location)
+          HashPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
         when 63 then
-          InstanceVariableOperatorOrWriteNode.new(load_location, load_location, load_node, location)
+          IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
         when 64 then
-          InstanceVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          ImaginaryNode.new(load_node, location)
         when 65 then
-          InstanceVariableReadNode.new(location)
+          InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
         when 66 then
-          InstanceVariableWriteNode.new(load_location, load_optional_node, load_optional_location, location)
+          InstanceVariableAndWriteNode.new(load_location, load_location, load_node, location)
         when 67 then
-          IntegerNode.new(location)
+          InstanceVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
         when 68 then
-          InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
+          InstanceVariableOrWriteNode.new(load_location, load_location, load_node, location)
         when 69 then
-          InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+          InstanceVariableReadNode.new(location)
         when 70 then
-          InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+          InstanceVariableTargetNode.new(location)
         when 71 then
-          InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+          InstanceVariableWriteNode.new(load_location, load_node, load_location, location)
         when 72 then
-          KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
+          IntegerNode.new(location)
         when 73 then
-          KeywordParameterNode.new(load_location, load_optional_node, location)
+          InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
         when 74 then
-          KeywordRestParameterNode.new(load_location, load_optional_location, location)
+          InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
         when 75 then
-          LambdaNode.new(Array.new(load_varint) { load_constant }, load_location, load_optional_node, load_optional_node, location)
+          InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
         when 76 then
-          LocalVariableOperatorAndWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
         when 77 then
-          LocalVariableOperatorOrWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
         when 78 then
-          LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, load_constant, location)
+          KeywordParameterNode.new(load_location, load_optional_node, location)
         when 79 then
-          LocalVariableReadNode.new(load_constant, load_varint, location)
+          KeywordRestParameterNode.new(load_location, load_optional_location, location)
         when 80 then
-          LocalVariableWriteNode.new(load_constant, load_varint, load_optional_node, load_location, load_optional_location, location)
+          LambdaNode.new(Array.new(load_varint) { load_constant }, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
         when 81 then
-          MatchPredicateNode.new(load_node, load_node, load_location, location)
+          LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_constant, load_varint, location)
         when 82 then
-          MatchRequiredNode.new(load_node, load_node, load_location, location)
+          LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, load_constant, load_varint, location)
         when 83 then
-          MissingNode.new(location)
+          LocalVariableOrWriteNode.new(load_location, load_location, load_node, load_constant, load_varint, location)
         when 84 then
-          ModuleNode.new(Array.new(load_varint) { load_constant }, load_location, load_node, load_optional_node, load_location, location)
+          LocalVariableReadNode.new(load_constant, load_varint, location)
         when 85 then
-          MultiWriteNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_location, load_optional_location, location)
+          LocalVariableTargetNode.new(load_constant, load_varint, location)
         when 86 then
-          NextNode.new(load_optional_node, load_location, location)
+          LocalVariableWriteNode.new(load_constant, load_varint, load_node, load_location, load_location, location)
         when 87 then
-          NilNode.new(location)
+          MatchPredicateNode.new(load_node, load_node, load_location, location)
         when 88 then
-          NoKeywordsParameterNode.new(load_location, load_location, location)
+          MatchRequiredNode.new(load_node, load_node, load_location, location)
         when 89 then
-          NumberedReferenceReadNode.new(location)
+          MissingNode.new(location)
         when 90 then
-          OptionalParameterNode.new(load_constant, load_location, load_location, load_node, location)
+          ModuleNode.new(Array.new(load_varint) { load_constant }, load_location, load_node, load_optional_node, load_location, load_string, location)
         when 91 then
-          OrNode.new(load_node, load_node, load_location, location)
+          MultiWriteNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_location, load_optional_location, location)
         when 92 then
-          ParametersNode.new(Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_node, location)
+          NextNode.new(load_optional_node, load_location, location)
         when 93 then
-          ParenthesesNode.new(load_optional_node, load_location, load_location, location)
+          NilNode.new(location)
         when 94 then
-          PinnedExpressionNode.new(load_node, load_location, load_location, load_location, location)
+          NoKeywordsParameterNode.new(load_location, load_location, location)
         when 95 then
-          PinnedVariableNode.new(load_node, load_location, location)
+          NumberedReferenceReadNode.new(location)
         when 96 then
-          PostExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
+          OptionalParameterNode.new(load_constant, load_location, load_location, load_node, location)
         when 97 then
-          PreExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
+          OrNode.new(load_node, load_node, load_location, location)
         when 98 then
-          ProgramNode.new(Array.new(load_varint) { load_constant }, load_node, location)
+          ParametersNode.new(Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_node, location)
         when 99 then
-          RangeNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+          ParenthesesNode.new(load_optional_node, load_location, load_location, location)
         when 100 then
-          RationalNode.new(load_node, location)
+          PinnedExpressionNode.new(load_node, load_location, load_location, load_location, location)
         when 101 then
-          RedoNode.new(location)
+          PinnedVariableNode.new(load_node, load_location, location)
         when 102 then
-          RegularExpressionNode.new(load_location, load_location, load_location, load_string, load_varint, location)
+          PostExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
         when 103 then
-          RequiredDestructuredParameterNode.new(Array.new(load_varint) { load_node }, load_location, load_location, location)
+          PreExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
         when 104 then
-          RequiredParameterNode.new(load_constant, location)
+          ProgramNode.new(Array.new(load_varint) { load_constant }, load_node, location)
         when 105 then
-          RescueModifierNode.new(load_node, load_location, load_node, location)
+          RangeNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
         when 106 then
-          RescueNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
+          RationalNode.new(load_node, location)
         when 107 then
-          RestParameterNode.new(load_location, load_optional_location, location)
+          RedoNode.new(location)
         when 108 then
-          RetryNode.new(location)
+          RegularExpressionNode.new(load_location, load_location, load_location, load_string, load_varint, location)
         when 109 then
-          ReturnNode.new(load_location, load_optional_node, location)
+          RequiredDestructuredParameterNode.new(Array.new(load_varint) { load_node }, load_location, load_location, location)
         when 110 then
-          SelfNode.new(location)
+          RequiredParameterNode.new(load_constant, location)
         when 111 then
-          SingletonClassNode.new(Array.new(load_varint) { load_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
+          RescueModifierNode.new(load_node, load_location, load_node, location)
         when 112 then
-          SourceEncodingNode.new(location)
+          RescueNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
         when 113 then
-          SourceFileNode.new(load_string, location)
+          RestParameterNode.new(load_location, load_optional_location, location)
         when 114 then
-          SourceLineNode.new(location)
+          RetryNode.new(location)
         when 115 then
-          SplatNode.new(load_location, load_optional_node, location)
+          ReturnNode.new(load_location, load_optional_node, location)
         when 116 then
-          StatementsNode.new(Array.new(load_varint) { load_node }, location)
+          SelfNode.new(location)
         when 117 then
-          StringConcatNode.new(load_node, load_node, location)
+          SingletonClassNode.new(Array.new(load_varint) { load_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
         when 118 then
-          StringNode.new(load_optional_location, load_location, load_optional_location, load_string, location)
+          SourceEncodingNode.new(location)
         when 119 then
-          SuperNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, location)
+          SourceFileNode.new(load_string, location)
         when 120 then
-          SymbolNode.new(load_optional_location, load_location, load_optional_location, load_string, location)
+          SourceLineNode.new(location)
         when 121 then
-          TrueNode.new(location)
+          SplatNode.new(load_location, load_optional_node, location)
         when 122 then
-          UndefNode.new(Array.new(load_varint) { load_node }, load_location, location)
+          StatementsNode.new(Array.new(load_varint) { load_node }, location)
         when 123 then
-          UnlessNode.new(load_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+          StringConcatNode.new(load_node, load_node, location)
         when 124 then
-          UntilNode.new(load_location, load_node, load_optional_node, load_varint, location)
+          StringNode.new(load_optional_location, load_location, load_optional_location, load_string, location)
         when 125 then
-          WhenNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_node, location)
+          SuperNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, location)
         when 126 then
-          WhileNode.new(load_location, load_node, load_optional_node, load_varint, location)
+          SymbolNode.new(load_optional_location, load_optional_location, load_optional_location, load_string, location)
         when 127 then
-          XStringNode.new(load_location, load_location, load_location, load_string, location)
+          TrueNode.new(location)
         when 128 then
+          UndefNode.new(Array.new(load_varint) { load_node }, load_location, location)
+        when 129 then
+          UnlessNode.new(load_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+        when 130 then
+          UntilNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
+        when 131 then
+          WhenNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_node, location)
+        when 132 then
+          WhileNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
+        when 133 then
+          XStringNode.new(load_location, load_location, load_location, load_string, location)
+        when 134 then
           YieldNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, location)
         end
       end

data/lib/yarp.rb

@@ -37,7 +37,7 @@ module YARP
   class Location
     # A Source object that is used to determine more information from the given
     # offset and length.
-    private attr_reader :source
+    protected attr_reader :source
 
     # The byte offset from the beginning of the source where this location
     # starts.
@@ -52,6 +52,16 @@ module YARP
       @length = length
     end
 
+    # Create a new location object with the given options.
+    def copy(**options)
+      Location.new(
+        options.fetch(:source) { source },
+        options.fetch(:start_offset) { start_offset },
+        options.fetch(:length) { length }
+      )
+    end
+
+    # Returns a string representation of this location.
     def inspect
       "#<YARP::Location @start_offset=#{@start_offset} @length=#{@length}>"
     end
@@ -102,6 +112,16 @@ module YARP
         other.end_offset == end_offset
     end
 
+    # Returns a new location that stretches from this location to the given
+    # other location. Raises an error if this location is not before the other
+    # location or if they don't share the same source.
+    def join(other)
+      raise "Incompatible sources" if source != other.source
+      raise "Incompatible locations" if start_offset > other.start_offset
+
+      Location.new(source, start_offset, other.end_offset - start_offset)
+    end
+
     def self.null
       new(0, 0)
     end
@@ -236,12 +256,6 @@ module YARP
       value.accept(visitor)
       value
     end
-
-    # Construct a new ParseResult with the same internal values, but with the
-    # given source.
-    def with_source(source)
-      ParseResult.new(value, comments, errors, warnings, source)
-    end
   end
 
   # This represents a token from the Ruby source.
@@ -319,6 +333,30 @@ module YARP
     end
   end
 
+  class FloatNode < Node
+    def value
+      Float(slice)
+    end
+  end
+
+  class ImaginaryNode < Node
+    def value
+      Complex(0, numeric.value)
+    end
+  end
+
+  class IntegerNode < Node
+    def value
+      Integer(slice)
+    end
+  end
+
+  class RationalNode < Node
+    def value
+      Rational(slice.chomp("r"))
+    end
+  end
+
   # Load the serialized AST using the source as a reference into a tree.
   def self.load(source, serialized)
     Serialize.load(source, serialized)
@@ -387,6 +425,10 @@ module YARP
             # of those here.
             names = names.grep_v(/^_\d$/)
 
+            # For some reason, CRuby occasionally pushes this special local
+            # variable when there are splat arguments. We get rid of that here.
+            names = names.grep_v(:"#arg_rest")
+
             # Now push them onto the list of locals.
             locals << names
           end
@@ -459,6 +501,8 @@ module YARP
           locals << []
         when PostExecutionNode
           locals.push([], [])
+        when InterpolatedRegularExpressionNode
+          locals << [] if node.once?
         end
 
         stack.concat(node.child_nodes.compact)
@@ -483,6 +527,8 @@ module YARP
 end
 
 require_relative "yarp/lex_compat"
+require_relative "yarp/mutation_visitor"
+require_relative "yarp/desugar_visitor"
 require_relative "yarp/node"
 require_relative "yarp/ripper_compat"
 require_relative "yarp/serialize"
@@ -491,5 +537,5 @@ require_relative "yarp/pack"
 if RUBY_ENGINE == "ruby" and !ENV["YARP_FFI_BACKEND"]
   require "yarp/yarp"
 else
-  require "yarp/ffi"
+  require_relative "yarp/ffi"
 end