yarp 0.7.0 → 0.8.0

data/lib/yarp/serialize.rb

@@ -21,7 +21,7 @@ end
 module YARP
   module Serialize
     MAJOR_VERSION = 0
-    MINOR_VERSION = 7
+    MINOR_VERSION = 8
     PATCH_VERSION = 0
 
     def self.load(input, serialized)
@@ -158,255 +158,225 @@ module YARP
         when 3 then
           AndNode.new(load_node, load_node, load_location, location)
         when 4 then
-          ArgumentsNode.new(Array.new(load_varint) { load_node }, location)
+          AndWriteNode.new(load_node, load_node, load_location, location)
         when 5 then
-          ArrayNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+          ArgumentsNode.new(Array.new(load_varint) { load_node }, location)
         when 6 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)
+          ArrayNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
         when 7 then
-          AssocNode.new(load_node, load_optional_node, load_optional_location, 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)
         when 8 then
-          AssocSplatNode.new(load_optional_node, load_location, location)
+          AssocNode.new(load_node, load_optional_node, load_optional_location, location)
         when 9 then
-          BackReferenceReadNode.new(location)
+          AssocSplatNode.new(load_optional_node, load_location, location)
         when 10 then
-          BeginNode.new(load_optional_location, load_optional_node, load_optional_node, load_optional_node, load_optional_node, load_optional_location, location)
+          BackReferenceReadNode.new(location)
         when 11 then
-          BlockArgumentNode.new(load_optional_node, load_location, location)
+          BeginNode.new(load_optional_location, load_optional_node, load_optional_node, load_optional_node, load_optional_node, load_optional_location, location)
         when 12 then
-          BlockNode.new(Array.new(load_varint) { load_constant }, load_optional_node, load_optional_node, load_location, load_location, location)
+          BlockArgumentNode.new(load_optional_node, load_location, location)
         when 13 then
-          BlockParameterNode.new(load_optional_location, load_location, location)
+          BlockNode.new(Array.new(load_varint) { load_constant }, load_optional_node, load_optional_node, load_location, load_location, location)
         when 14 then
-          BlockParametersNode.new(load_optional_node, Array.new(load_varint) { load_location }, load_optional_location, load_optional_location, location)
+          BlockParameterNode.new(load_optional_location, load_location, location)
         when 15 then
-          BreakNode.new(load_optional_node, load_location, location)
+          BlockParametersNode.new(load_optional_node, Array.new(load_varint) { load_location }, load_optional_location, load_optional_location, location)
         when 16 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_string, location)
+          BreakNode.new(load_optional_node, load_location, location)
         when 17 then
-          CallOperatorAndWriteNode.new(load_node, load_location, load_node, 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_string, location)
         when 18 then
-          CallOperatorOrWriteNode.new(load_node, load_node, load_location, location)
+          CallOperatorAndWriteNode.new(load_node, load_location, load_node, location)
         when 19 then
-          CallOperatorWriteNode.new(load_node, load_location, load_node, load_constant, location)
+          CallOperatorOrWriteNode.new(load_node, load_node, load_location, location)
         when 20 then
-          CapturePatternNode.new(load_node, load_node, load_location, location)
+          CallOperatorWriteNode.new(load_node, load_location, load_node, load_constant, location)
         when 21 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 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)
+          CaseNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
         when 23 then
-          ClassVariableOperatorAndWriteNode.new(load_location, load_location, load_node, location)
+          ClassNode.new(Array.new(load_varint) { load_constant }, load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_location, location)
         when 24 then
-          ClassVariableOperatorOrWriteNode.new(load_location, load_location, load_node, location)
+          ClassVariableReadNode.new(location)
         when 25 then
-          ClassVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          ClassVariableWriteNode.new(load_location, load_optional_node, load_optional_location, location)
         when 26 then
-          ClassVariableReadNode.new(location)
+          ConstantPathNode.new(load_optional_node, load_node, load_location, location)
         when 27 then
-          ClassVariableWriteNode.new(load_location, load_optional_node, load_optional_location, location)
+          ConstantPathWriteNode.new(load_node, load_optional_location, load_optional_node, location)
         when 28 then
-          ConstantOperatorAndWriteNode.new(load_location, load_location, load_node, location)
+          ConstantReadNode.new(location)
         when 29 then
-          ConstantOperatorOrWriteNode.new(load_location, load_location, load_node, location)
+          ConstantWriteNode.new(load_location, load_optional_node, load_optional_location, location)
         when 30 then
-          ConstantOperatorWriteNode.new(load_location, load_location, load_node, load_constant, 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 31 then
-          ConstantPathNode.new(load_optional_node, load_node, load_location, location)
+          DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
         when 32 then
-          ConstantPathOperatorAndWriteNode.new(load_node, load_location, load_node, location)
+          ElseNode.new(load_location, load_optional_node, load_optional_location, location)
         when 33 then
-          ConstantPathOperatorOrWriteNode.new(load_node, load_location, load_node, location)
+          EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
         when 34 then
-          ConstantPathOperatorWriteNode.new(load_node, load_location, load_node, load_constant, location)
+          EmbeddedVariableNode.new(load_location, load_node, location)
         when 35 then
-          ConstantPathWriteNode.new(load_node, load_optional_location, load_optional_node, location)
+          EnsureNode.new(load_location, load_optional_node, load_location, location)
         when 36 then
-          ConstantReadNode.new(location)
+          FalseNode.new(location)
         when 37 then
-          ConstantWriteNode.new(load_location, load_optional_node, load_optional_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 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)
+          FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
         when 39 then
-          DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
+          FloatNode.new(location)
         when 40 then
-          ElseNode.new(load_location, load_optional_node, load_optional_location, location)
+          ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
         when 41 then
-          EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
+          ForwardingArgumentsNode.new(location)
         when 42 then
-          EmbeddedVariableNode.new(load_location, load_node, location)
+          ForwardingParameterNode.new(location)
         when 43 then
-          EnsureNode.new(load_location, load_optional_node, load_location, location)
+          ForwardingSuperNode.new(load_optional_node, location)
         when 44 then
-          FalseNode.new(location)
+          GlobalVariableReadNode.new(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)
+          GlobalVariableWriteNode.new(load_location, load_optional_location, load_optional_node, location)
         when 46 then
-          FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+          HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
         when 47 then
-          FloatNode.new(location)
+          HashPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
         when 48 then
-          ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
+          IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
         when 49 then
-          ForwardingArgumentsNode.new(location)
+          ImaginaryNode.new(load_node, location)
         when 50 then
-          ForwardingParameterNode.new(location)
+          InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
         when 51 then
-          ForwardingSuperNode.new(load_optional_node, location)
+          InstanceVariableReadNode.new(location)
         when 52 then
-          GlobalVariableOperatorAndWriteNode.new(load_location, load_location, load_node, location)
+          InstanceVariableWriteNode.new(load_location, load_optional_node, load_optional_location, location)
         when 53 then
-          GlobalVariableOperatorOrWriteNode.new(load_location, load_location, load_node, location)
+          IntegerNode.new(location)
         when 54 then
-          GlobalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
         when 55 then
-          GlobalVariableReadNode.new(location)
+          InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
         when 56 then
-          GlobalVariableWriteNode.new(load_location, load_optional_location, load_optional_node, location)
+          InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
         when 57 then
-          HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+          InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, 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)
+          KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
         when 59 then
-          IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+          KeywordParameterNode.new(load_location, load_optional_node, location)
         when 60 then
-          ImaginaryNode.new(load_node, location)
+          KeywordRestParameterNode.new(load_location, load_optional_location, location)
         when 61 then
-          InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
+          LambdaNode.new(Array.new(load_varint) { load_constant }, load_location, load_optional_node, load_optional_node, location)
         when 62 then
-          InstanceVariableOperatorAndWriteNode.new(load_location, load_location, load_node, location)
+          LocalVariableReadNode.new(load_constant, load_varint, location)
         when 63 then
-          InstanceVariableOperatorOrWriteNode.new(load_location, load_location, load_node, location)
+          LocalVariableWriteNode.new(load_constant, load_varint, load_optional_node, load_location, load_optional_location, location)
         when 64 then
-          InstanceVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          MatchPredicateNode.new(load_node, load_node, load_location, location)
         when 65 then
-          InstanceVariableReadNode.new(location)
+          MatchRequiredNode.new(load_node, load_node, load_location, location)
         when 66 then
-          InstanceVariableWriteNode.new(load_location, load_optional_node, load_optional_location, location)
+          MissingNode.new(location)
         when 67 then
-          IntegerNode.new(location)
+          ModuleNode.new(Array.new(load_varint) { load_constant }, load_location, load_node, load_optional_node, load_location, location)
         when 68 then
-          InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
+          MultiWriteNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_location, load_optional_location, location)
         when 69 then
-          InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+          NextNode.new(load_optional_node, load_location, location)
         when 70 then
-          InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+          NilNode.new(location)
         when 71 then
-          InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+          NoKeywordsParameterNode.new(load_location, load_location, location)
         when 72 then
-          KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
+          NumberedReferenceReadNode.new(location)
         when 73 then
-          KeywordParameterNode.new(load_location, load_optional_node, location)
+          OperatorWriteNode.new(load_node, load_location, load_constant, load_node, location)
         when 74 then
-          KeywordRestParameterNode.new(load_location, load_optional_location, location)
+          OptionalParameterNode.new(load_constant, load_location, load_location, load_node, location)
         when 75 then
-          LambdaNode.new(Array.new(load_varint) { load_constant }, load_location, load_optional_node, load_optional_node, location)
+          OrNode.new(load_node, load_node, load_location, location)
         when 76 then
-          LocalVariableOperatorAndWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          OrWriteNode.new(load_node, load_node, load_location, location)
         when 77 then
-          LocalVariableOperatorOrWriteNode.new(load_location, load_location, load_node, load_constant, location)
-        when 78 then
-          LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, load_constant, location)
-        when 79 then
-          LocalVariableReadNode.new(load_constant, load_varint, location)
-        when 80 then
-          LocalVariableWriteNode.new(load_constant, load_varint, load_optional_node, load_location, load_optional_location, location)
-        when 81 then
-          MatchPredicateNode.new(load_node, load_node, load_location, location)
-        when 82 then
-          MatchRequiredNode.new(load_node, load_node, load_location, location)
-        when 83 then
-          MissingNode.new(location)
-        when 84 then
-          ModuleNode.new(Array.new(load_varint) { load_constant }, load_location, load_node, load_optional_node, load_location, 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)
-        when 86 then
-          NextNode.new(load_optional_node, load_location, location)
-        when 87 then
-          NilNode.new(location)
-        when 88 then
-          NoKeywordsParameterNode.new(load_location, load_location, location)
-        when 89 then
-          NumberedReferenceReadNode.new(location)
-        when 90 then
-          OptionalParameterNode.new(load_constant, load_location, load_location, load_node, location)
-        when 91 then
-          OrNode.new(load_node, load_node, load_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)
-        when 93 then
+        when 78 then
           ParenthesesNode.new(load_optional_node, load_location, load_location, location)
-        when 94 then
+        when 79 then
           PinnedExpressionNode.new(load_node, load_location, load_location, load_location, location)
-        when 95 then
+        when 80 then
           PinnedVariableNode.new(load_node, load_location, location)
-        when 96 then
+        when 81 then
           PostExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
-        when 97 then
+        when 82 then
           PreExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
-        when 98 then
+        when 83 then
           ProgramNode.new(Array.new(load_varint) { load_constant }, load_node, location)
-        when 99 then
+        when 84 then
           RangeNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
-        when 100 then
+        when 85 then
           RationalNode.new(load_node, location)
-        when 101 then
+        when 86 then
           RedoNode.new(location)
-        when 102 then
+        when 87 then
           RegularExpressionNode.new(load_location, load_location, load_location, load_string, load_varint, location)
-        when 103 then
+        when 88 then
           RequiredDestructuredParameterNode.new(Array.new(load_varint) { load_node }, load_location, load_location, location)
-        when 104 then
+        when 89 then
           RequiredParameterNode.new(load_constant, location)
-        when 105 then
+        when 90 then
           RescueModifierNode.new(load_node, load_location, load_node, location)
-        when 106 then
+        when 91 then
           RescueNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
-        when 107 then
+        when 92 then
           RestParameterNode.new(load_location, load_optional_location, location)
-        when 108 then
+        when 93 then
           RetryNode.new(location)
-        when 109 then
+        when 94 then
           ReturnNode.new(load_location, load_optional_node, location)
-        when 110 then
+        when 95 then
           SelfNode.new(location)
-        when 111 then
+        when 96 then
           SingletonClassNode.new(Array.new(load_varint) { load_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
-        when 112 then
+        when 97 then
           SourceEncodingNode.new(location)
-        when 113 then
+        when 98 then
           SourceFileNode.new(load_string, location)
-        when 114 then
+        when 99 then
           SourceLineNode.new(location)
-        when 115 then
+        when 100 then
           SplatNode.new(load_location, load_optional_node, location)
-        when 116 then
+        when 101 then
           StatementsNode.new(Array.new(load_varint) { load_node }, location)
-        when 117 then
+        when 102 then
           StringConcatNode.new(load_node, load_node, location)
-        when 118 then
+        when 103 then
           StringNode.new(load_optional_location, load_location, load_optional_location, load_string, location)
-        when 119 then
+        when 104 then
           SuperNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, location)
-        when 120 then
+        when 105 then
           SymbolNode.new(load_optional_location, load_location, load_optional_location, load_string, location)
-        when 121 then
+        when 106 then
           TrueNode.new(location)
-        when 122 then
+        when 107 then
           UndefNode.new(Array.new(load_varint) { load_node }, load_location, location)
-        when 123 then
+        when 108 then
           UnlessNode.new(load_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
-        when 124 then
+        when 109 then
           UntilNode.new(load_location, load_node, load_optional_node, load_varint, location)
-        when 125 then
+        when 110 then
           WhenNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_node, location)
-        when 126 then
+        when 111 then
           WhileNode.new(load_location, load_node, load_optional_node, load_varint, location)
-        when 127 then
+        when 112 then
           XStringNode.new(load_location, load_location, load_location, load_string, location)
-        when 128 then
+        when 113 then
           YieldNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, location)
         end
       end

data/lib/yarp.rb

@@ -236,12 +236,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.
@@ -387,6 +381,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 +457,8 @@ module YARP
           locals << []
         when PostExecutionNode
           locals.push([], [])
+        when InterpolatedRegularExpressionNode
+          locals << [] if node.once?
         end
 
         stack.concat(node.child_nodes.compact)