Enhance and test the interface for YARV instructions

Author: kddnewton

lib/syntax_tree/yarv/instructions.rb

@@ -858,10 +858,8 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(DefineClass) &&
-          other.name == name &&
-          other.class_iseq == class_iseq &&
-          other.flags == flags
+        other.is_a?(DefineClass) && other.name == name &&
+          other.class_iseq == class_iseq && other.flags == flags
       end
 
       def length
@@ -997,9 +995,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(Defined) &&
-          other.type == type &&
-          other.name == name &&
+        other.is_a?(Defined) && other.type == type && other.name == name &&
           other.message == message
       end
 
@@ -1098,8 +1094,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(DefineMethod) &&
-          other.method_name == method_name &&
+        other.is_a?(DefineMethod) && other.method_name == method_name &&
           other.method_iseq == method_iseq
       end
 
@@ -1180,8 +1175,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(DefineSMethod) &&
-          other.method_name == method_name &&
+        other.is_a?(DefineSMethod) && other.method_name == method_name &&
           other.method_iseq == method_iseq
       end
 
@@ -1468,8 +1462,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(ExpandArray) &&
-          other.number == number &&
+        other.is_a?(ExpandArray) && other.number == number &&
           other.flags == flags
       end
 
@@ -1569,8 +1562,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(GetBlockParam) &&
-          other.index == index &&
+        other.is_a?(GetBlockParam) && other.index == index &&
           other.level == level
       end
 
@@ -1636,8 +1628,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(GetBlockParamProxy) &&
-          other.index == index &&
+        other.is_a?(GetBlockParamProxy) && other.index == index &&
           other.level == level
       end
 
@@ -1698,8 +1689,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(GetClassVariable) &&
-          other.name == name &&
+        other.is_a?(GetClassVariable) && other.name == name &&
           other.cache == cache
       end
 
@@ -1895,8 +1885,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(GetInstanceVariable) &&
-          other.name == name &&
+        other.is_a?(GetInstanceVariable) && other.name == name &&
           other.cache == cache
       end
 
@@ -2309,8 +2298,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(InvokeSuper) &&
-          other.calldata == calldata &&
+        other.is_a?(InvokeSuper) && other.calldata == calldata &&
           other.block_iseq == block_iseq
       end
 
@@ -3010,8 +2998,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(OptArefWith) &&
-          other.object == object &&
+        other.is_a?(OptArefWith) && other.object == object &&
           other.calldata == calldata
       end
 
@@ -3129,8 +3116,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(OptAsetWith) &&
-          other.object == object &&
+        other.is_a?(OptAsetWith) && other.object == object &&
           other.calldata == calldata
       end
 
@@ -4020,8 +4006,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(OptNEq) &&
-          other.eq_calldata == eq_calldata &&
+        other.is_a?(OptNEq) && other.eq_calldata == eq_calldata &&
           other.neq_calldata == neq_calldata
       end
 
@@ -4590,8 +4575,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(OptStrFreeze) &&
-          other.object == object &&
+        other.is_a?(OptStrFreeze) && other.object == object &&
           other.calldata == calldata
       end
 
@@ -4652,8 +4636,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(OptStrUMinus) &&
-          other.object == object &&
+        other.is_a?(OptStrUMinus) && other.object == object &&
           other.calldata == calldata
       end
 
@@ -5194,8 +5177,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(Send) &&
-          other.calldata == calldata &&
+        other.is_a?(Send) && other.calldata == calldata &&
           other.block_iseq == block_iseq
       end
 
@@ -5281,8 +5263,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(SetBlockParam) &&
-          other.index == index &&
+        other.is_a?(SetBlockParam) && other.index == index &&
           other.level == level
       end
 
@@ -5344,8 +5325,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(SetClassVariable) &&
-          other.name == name &&
+        other.is_a?(SetClassVariable) && other.name == name &&
           other.cache == cache
       end
 
@@ -5525,8 +5505,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(SetInstanceVariable) &&
-          other.name == name &&
+        other.is_a?(SetInstanceVariable) && other.name == name &&
           other.cache == cache
       end
 
@@ -6169,8 +6148,7 @@ def deconstruct_keys(keys)
       end
 
       def ==(other)
-        other.is_a?(ToRegExp) &&
-          other.options == options &&
+        other.is_a?(ToRegExp) && other.options == options &&
           other.length == length
       end
 

lib/syntax_tree/yarv/legacy.rb

@@ -37,7 +37,7 @@ def to_a(_iseq)
         def deconstruct_keys(keys)
           { name: name }
         end
-  
+
         def ==(other)
           other.is_a?(GetClassVariable) && other.name == name
         end
@@ -101,10 +101,9 @@ def to_a(_iseq)
         def deconstruct_keys(keys)
           { label: label, cache: cache }
         end
-  
+
         def ==(other)
-          other.is_a?(OptGetInlineCache) &&
-            other.label == label &&
+          other.is_a?(OptGetInlineCache) && other.label == label &&
             other.cache == cache
         end
 
@@ -162,7 +161,7 @@ def to_a(_iseq)
         def deconstruct_keys(keys)
           { cache: cache }
         end
-  
+
         def ==(other)
           other.is_a?(OptSetInlineCache) && other.cache == cache
         end
@@ -219,7 +218,7 @@ def to_a(_iseq)
         def deconstruct_keys(keys)
           { name: name }
         end
-  
+
         def ==(other)
           other.is_a?(SetClassVariable) && other.name == name
         end

test/yarv_test.rb

@@ -290,19 +290,19 @@ def value
 
     instructions =
       YARV.constants.map { YARV.const_get(_1) } +
-      YARV::Legacy.constants.map { YARV::Legacy.const_get(_1) } -
-      [
-        YARV::Assembler,
-        YARV::Bf,
-        YARV::CallData,
-        YARV::Compiler,
-        YARV::Decompiler,
-        YARV::Disassembler,
-        YARV::InstructionSequence,
-        YARV::Legacy,
-        YARV::LocalTable,
-        YARV::VM
-      ]
+        YARV::Legacy.constants.map { YARV::Legacy.const_get(_1) } -
+        [
+          YARV::Assembler,
+          YARV::Bf,
+          YARV::CallData,
+          YARV::Compiler,
+          YARV::Decompiler,
+          YARV::Disassembler,
+          YARV::InstructionSequence,
+          YARV::Legacy,
+          YARV::LocalTable,
+          YARV::VM
+        ]
 
     interface = %i[
       disasm