yarp 0.10.0 → 0.11.0

data/lib/yarp/serialize.rb

@@ -21,11 +21,17 @@ end
 module YARP
   module Serialize
     MAJOR_VERSION = 0
-    MINOR_VERSION = 10
+    MINOR_VERSION = 11
     PATCH_VERSION = 0
 
     def self.load(input, serialized)
-      Loader.new(Source.new(input), serialized).load_result
+      input = input.dup
+      source = Source.new(input)
+      loader = Loader.new(source, serialized)
+      result = loader.load_result
+
+      input.force_encoding(loader.encoding)
+      result
     end
 
     def self.load_tokens(source, serialized)
@@ -159,23 +165,36 @@ module YARP
         load_location if io.getbyte != 0
       end
 
-      def load_constant
-        index = load_varint - 1
+      def load_constant(index)
         constant = constant_pool[index]
 
         unless constant
           offset = constant_pool_offset + index * 8
-
           start = serialized.unpack1("L", offset: offset)
           length = serialized.unpack1("L", offset: offset + 4)
 
-          constant = input.byteslice(start, length).to_sym
+          constant =
+            if start.nobits?(1 << 31)
+              input.byteslice(start, length).to_sym
+            else
+              serialized.byteslice(start & ((1 << 31) - 1), length).to_sym
+            end
+
           constant_pool[index] = constant
         end
 
         constant
       end
 
+      def load_required_constant
+        load_constant(load_varint - 1)
+      end
+
+      def load_optional_constant
+        index = load_varint
+        load_constant(index - 1) if index != 0
+      end
+
       def load_node
         type = io.getbyte
         location = load_location
@@ -204,251 +223,255 @@ module YARP
         when 11 then
           BlockArgumentNode.new(load_optional_node, load_location, location)
         when 12 then
-          BlockNode.new(Array.new(load_varint) { load_constant }, load_optional_node, load_optional_node, load_location, load_location, location)
+          BlockLocalVariableNode.new(load_required_constant, location)
         when 13 then
-          BlockParameterNode.new(load_optional_location, load_location, location)
+          BlockNode.new(Array.new(load_varint) { load_required_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_constant, 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_node }, 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)
+          CallAndWriteNode.new(load_optional_node, load_optional_location, load_optional_location, load_optional_location, load_optional_node, load_optional_location, load_varint, load_string, load_string, load_location, load_node, location)
         when 18 then
-          CallOperatorOrWriteNode.new(load_node, load_node, load_location, 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 19 then
-          CallOperatorWriteNode.new(load_node, load_location, load_node, load_constant, location)
+          CallOperatorWriteNode.new(load_optional_node, load_optional_location, load_optional_location, load_optional_location, load_optional_node, load_optional_location, load_varint, load_string, load_string, load_required_constant, load_location, load_node, location)
         when 20 then
-          CapturePatternNode.new(load_node, load_node, load_location, location)
+          CallOrWriteNode.new(load_optional_node, load_optional_location, load_optional_location, load_optional_location, load_optional_node, load_optional_location, load_varint, load_string, load_string, load_location, load_node, 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, load_string, location)
+          CaseNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
         when 23 then
-          ClassVariableAndWriteNode.new(load_constant, load_location, load_location, load_node, 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)
         when 24 then
-          ClassVariableOperatorWriteNode.new(load_constant, load_location, load_location, load_node, load_constant, location)
+          ClassVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
         when 25 then
-          ClassVariableOrWriteNode.new(load_constant, load_location, load_location, load_node, location)
+          ClassVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
         when 26 then
-          ClassVariableReadNode.new(load_constant, location)
+          ClassVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
         when 27 then
-          ClassVariableTargetNode.new(load_constant, location)
+          ClassVariableReadNode.new(load_required_constant, location)
         when 28 then
-          ClassVariableWriteNode.new(load_constant, load_location, load_optional_node, load_optional_location, location)
+          ClassVariableTargetNode.new(load_required_constant, location)
         when 29 then
-          ConstantAndWriteNode.new(load_location, load_location, load_node, location)
+          ClassVariableWriteNode.new(load_required_constant, load_location, load_node, load_optional_location, location)
         when 30 then
-          ConstantOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          ConstantAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
         when 31 then
-          ConstantOrWriteNode.new(load_location, load_location, load_node, location)
+          ConstantOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
         when 32 then
-          ConstantPathAndWriteNode.new(load_node, load_location, load_node, location)
+          ConstantOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
         when 33 then
-          ConstantPathNode.new(load_optional_node, load_node, load_location, location)
+          ConstantPathAndWriteNode.new(load_node, load_location, load_node, location)
         when 34 then
-          ConstantPathOperatorWriteNode.new(load_node, load_location, load_node, load_constant, location)
+          ConstantPathNode.new(load_optional_node, load_node, load_location, location)
         when 35 then
-          ConstantPathOrWriteNode.new(load_node, load_location, load_node, location)
+          ConstantPathOperatorWriteNode.new(load_node, load_location, load_node, load_required_constant, location)
         when 36 then
-          ConstantPathTargetNode.new(load_optional_node, load_node, load_location, location)
+          ConstantPathOrWriteNode.new(load_node, load_location, load_node, location)
         when 37 then
-          ConstantPathWriteNode.new(load_node, load_location, load_node, location)
+          ConstantPathTargetNode.new(load_optional_node, load_node, load_location, location)
         when 38 then
-          ConstantReadNode.new(location)
+          ConstantPathWriteNode.new(load_node, load_location, load_node, location)
         when 39 then
-          ConstantTargetNode.new(location)
+          ConstantReadNode.new(load_required_constant, location)
         when 40 then
-          ConstantWriteNode.new(load_location, load_node, load_location, location)
+          ConstantTargetNode.new(load_required_constant, location)
         when 41 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)
+          ConstantWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
         when 42 then
-          DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, 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)
         when 43 then
-          ElseNode.new(load_location, load_optional_node, load_optional_location, location)
+          DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
         when 44 then
-          EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
+          ElseNode.new(load_location, load_optional_node, load_optional_location, location)
         when 45 then
-          EmbeddedVariableNode.new(load_location, load_node, location)
+          EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
         when 46 then
-          EnsureNode.new(load_location, load_optional_node, load_location, location)
+          EmbeddedVariableNode.new(load_location, load_node, location)
         when 47 then
-          FalseNode.new(location)
+          EnsureNode.new(load_location, load_optional_node, load_location, location)
         when 48 then
-          FindPatternNode.new(load_optional_node, load_node, Array.new(load_varint) { load_node }, load_node, load_optional_location, load_optional_location, location)
+          FalseNode.new(location)
         when 49 then
-          FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+          FindPatternNode.new(load_optional_node, load_node, Array.new(load_varint) { load_node }, load_node, load_optional_location, load_optional_location, location)
         when 50 then
-          FloatNode.new(location)
+          FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
         when 51 then
-          ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
+          FloatNode.new(location)
         when 52 then
-          ForwardingArgumentsNode.new(location)
+          ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
         when 53 then
-          ForwardingParameterNode.new(location)
+          ForwardingArgumentsNode.new(location)
         when 54 then
-          ForwardingSuperNode.new(load_optional_node, location)
+          ForwardingParameterNode.new(location)
         when 55 then
-          GlobalVariableAndWriteNode.new(load_location, load_location, load_node, location)
+          ForwardingSuperNode.new(load_optional_node, location)
         when 56 then
-          GlobalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, location)
+          GlobalVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
         when 57 then
-          GlobalVariableOrWriteNode.new(load_location, load_location, load_node, location)
+          GlobalVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
         when 58 then
-          GlobalVariableReadNode.new(location)
+          GlobalVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
         when 59 then
-          GlobalVariableTargetNode.new(location)
+          GlobalVariableReadNode.new(load_required_constant, location)
         when 60 then
-          GlobalVariableWriteNode.new(load_location, load_node, load_location, location)
+          GlobalVariableTargetNode.new(load_required_constant, location)
         when 61 then
-          HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+          GlobalVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
         when 62 then
-          HashPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
+          HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
         when 63 then
-          IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+          HashPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
         when 64 then
-          ImaginaryNode.new(load_node, location)
+          IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
         when 65 then
-          InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
+          ImaginaryNode.new(load_node, location)
         when 66 then
-          InstanceVariableAndWriteNode.new(load_constant, load_location, load_location, load_node, location)
+          InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
         when 67 then
-          InstanceVariableOperatorWriteNode.new(load_constant, load_location, load_location, load_node, load_constant, location)
+          InstanceVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
         when 68 then
-          InstanceVariableOrWriteNode.new(load_constant, load_location, load_location, load_node, location)
+          InstanceVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
         when 69 then
-          InstanceVariableReadNode.new(load_constant, location)
+          InstanceVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
         when 70 then
-          InstanceVariableTargetNode.new(load_constant, location)
+          InstanceVariableReadNode.new(load_required_constant, location)
         when 71 then
-          InstanceVariableWriteNode.new(load_constant, load_location, load_node, load_location, location)
+          InstanceVariableTargetNode.new(load_required_constant, location)
         when 72 then
-          IntegerNode.new(location)
+          InstanceVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
         when 73 then
-          InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
+          IntegerNode.new(location)
         when 74 then
-          InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+          InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
         when 75 then
-          InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+          InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
         when 76 then
-          InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+          InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
         when 77 then
-          KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
+          InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
         when 78 then
-          KeywordParameterNode.new(load_location, load_optional_node, location)
+          KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
         when 79 then
-          KeywordRestParameterNode.new(load_location, load_optional_location, location)
+          KeywordParameterNode.new(load_required_constant, load_location, load_optional_node, location)
         when 80 then
-          LambdaNode.new(Array.new(load_varint) { load_constant }, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
+          KeywordRestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
         when 81 then
-          LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_constant, load_varint, location)
+          LambdaNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
         when 82 then
-          LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_constant, load_constant, load_varint, location)
+          LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
         when 83 then
-          LocalVariableOrWriteNode.new(load_location, load_location, load_node, load_constant, load_varint, location)
+          LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_required_constant, load_required_constant, load_varint, location)
         when 84 then
-          LocalVariableReadNode.new(load_constant, load_varint, location)
+          LocalVariableOrWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
         when 85 then
-          LocalVariableTargetNode.new(load_constant, load_varint, location)
+          LocalVariableReadNode.new(load_required_constant, load_varint, location)
         when 86 then
-          LocalVariableWriteNode.new(load_constant, load_varint, load_location, load_node, load_location, location)
+          LocalVariableTargetNode.new(load_required_constant, load_varint, location)
         when 87 then
-          MatchPredicateNode.new(load_node, load_node, load_location, location)
+          LocalVariableWriteNode.new(load_required_constant, load_varint, load_location, load_node, load_location, location)
         when 88 then
-          MatchRequiredNode.new(load_node, load_node, load_location, location)
+          MatchPredicateNode.new(load_node, load_node, load_location, location)
         when 89 then
-          MissingNode.new(location)
+          MatchRequiredNode.new(load_node, load_node, load_location, location)
         when 90 then
-          ModuleNode.new(Array.new(load_varint) { load_constant }, load_location, load_node, load_optional_node, load_location, load_string, location)
+          MissingNode.new(location)
         when 91 then
-          MultiWriteNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_location, load_optional_location, location)
+          ModuleNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_node, load_optional_node, load_location, load_required_constant, location)
         when 92 then
-          NextNode.new(load_optional_node, load_location, location)
+          MultiTargetNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
         when 93 then
-          NilNode.new(location)
+          MultiWriteNode.new(Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, load_location, load_node, location)
         when 94 then
-          NoKeywordsParameterNode.new(load_location, load_location, location)
+          NextNode.new(load_optional_node, load_location, location)
         when 95 then
-          NumberedReferenceReadNode.new(load_varint, location)
+          NilNode.new(location)
         when 96 then
-          OptionalParameterNode.new(load_constant, load_location, load_location, load_node, location)
+          NoKeywordsParameterNode.new(load_location, load_location, location)
         when 97 then
-          OrNode.new(load_node, load_node, load_location, location)
+          NumberedReferenceReadNode.new(load_varint, location)
         when 98 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)
+          OptionalParameterNode.new(load_required_constant, load_location, load_location, load_node, location)
         when 99 then
-          ParenthesesNode.new(load_optional_node, load_location, load_location, location)
+          OrNode.new(load_node, load_node, load_location, location)
         when 100 then
-          PinnedExpressionNode.new(load_node, load_location, load_location, load_location, 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 101 then
-          PinnedVariableNode.new(load_node, load_location, location)
+          ParenthesesNode.new(load_optional_node, load_location, load_location, location)
         when 102 then
-          PostExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
+          PinnedExpressionNode.new(load_node, load_location, load_location, load_location, location)
         when 103 then
-          PreExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
+          PinnedVariableNode.new(load_node, load_location, location)
         when 104 then
-          ProgramNode.new(Array.new(load_varint) { load_constant }, load_node, location)
+          PostExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
         when 105 then
-          RangeNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+          PreExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
         when 106 then
-          RationalNode.new(load_node, location)
+          ProgramNode.new(Array.new(load_varint) { load_required_constant }, load_node, location)
         when 107 then
-          RedoNode.new(location)
+          RangeNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
         when 108 then
-          RegularExpressionNode.new(load_location, load_location, load_location, load_string, load_varint, location)
+          RationalNode.new(load_node, location)
         when 109 then
-          RequiredDestructuredParameterNode.new(Array.new(load_varint) { load_node }, load_location, load_location, location)
+          RedoNode.new(location)
         when 110 then
-          RequiredParameterNode.new(load_constant, location)
+          RegularExpressionNode.new(load_location, load_location, load_location, load_string, load_varint, location)
         when 111 then
-          RescueModifierNode.new(load_node, load_location, load_node, location)
+          RequiredDestructuredParameterNode.new(Array.new(load_varint) { load_node }, load_location, load_location, location)
         when 112 then
-          RescueNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
+          RequiredParameterNode.new(load_required_constant, location)
         when 113 then
-          RestParameterNode.new(load_location, load_optional_location, location)
+          RescueModifierNode.new(load_node, load_location, load_node, location)
         when 114 then
-          RetryNode.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 115 then
-          ReturnNode.new(load_location, load_optional_node, location)
+          RestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
         when 116 then
-          SelfNode.new(location)
+          RetryNode.new(location)
         when 117 then
-          SingletonClassNode.new(Array.new(load_varint) { load_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
+          ReturnNode.new(load_location, load_optional_node, location)
         when 118 then
-          SourceEncodingNode.new(location)
+          SelfNode.new(location)
         when 119 then
-          SourceFileNode.new(load_string, location)
+          SingletonClassNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
         when 120 then
-          SourceLineNode.new(location)
+          SourceEncodingNode.new(location)
         when 121 then
-          SplatNode.new(load_location, load_optional_node, location)
+          SourceFileNode.new(load_string, location)
         when 122 then
-          StatementsNode.new(Array.new(load_varint) { load_node }, location)
+          SourceLineNode.new(location)
         when 123 then
-          StringConcatNode.new(load_node, load_node, location)
+          SplatNode.new(load_location, load_optional_node, location)
         when 124 then
-          StringNode.new(load_optional_location, load_location, load_optional_location, load_string, location)
+          StatementsNode.new(Array.new(load_varint) { load_node }, location)
         when 125 then
-          SuperNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, location)
+          StringConcatNode.new(load_node, load_node, location)
         when 126 then
-          SymbolNode.new(load_optional_location, load_optional_location, load_optional_location, load_string, location)
+          StringNode.new(load_optional_location, load_location, load_optional_location, load_string, location)
         when 127 then
-          TrueNode.new(location)
+          SuperNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, load_optional_node, location)
         when 128 then
-          UndefNode.new(Array.new(load_varint) { load_node }, load_location, location)
+          SymbolNode.new(load_optional_location, load_optional_location, load_optional_location, load_string, location)
         when 129 then
-          UnlessNode.new(load_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+          TrueNode.new(location)
         when 130 then
-          UntilNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
+          UndefNode.new(Array.new(load_varint) { load_node }, load_location, location)
         when 131 then
-          WhenNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_node, location)
+          UnlessNode.new(load_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
         when 132 then
-          WhileNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
+          UntilNode.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)
+          WhenNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_node, location)
         when 134 then
+          WhileNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
+        when 135 then
+          XStringNode.new(load_location, load_location, load_location, load_string, location)
+        when 136 then
           YieldNode.new(load_location, load_optional_location, load_optional_node, load_optional_location, location)
         end
       end