Fix duplicated processing attributes

m3m0r7 · m3m0r7 · commit 30c71e760b25 · 2019-10-30T01:30:42.000+09:00
diff --git a/src/Compiler/Builder/Attributes/Code.php b/src/Compiler/Builder/Attributes/Code.php
@@ -192,8 +192,9 @@ public function getValue(): string
                     ->getResult(false)
                     ->getEntryIndex()
             );
-            $writer->writeUnsignedInt(strlen($attribute->getValue()));
-            $writer->write($attribute->getValue());
+            $value = $attribute->getValue();
+            $writer->writeUnsignedInt(strlen($value));
+            $writer->write($value);
         }
 
         return $writer->getStreamContents();
diff --git a/src/Compiler/Builder/Attributes/StackMapTable.php b/src/Compiler/Builder/Attributes/StackMapTable.php
@@ -126,19 +126,6 @@ public function getValue(): string
         $emulatedAccumulator = new Accumulator();
         $currentOffset = 0;
 
-//        foreach ($this->localVariables as $variableName => $variable) {
-//            [$index, $classType] = $variable;
-//            $emulatedAccumulator
-//                ->setDefaultLocal(
-//                    $index,
-//                    [
-//                        VerificationTypeTag::ITEM_Object,
-//                        $this->getEnhancedConstantPool()
-//                            ->findClass($classType),
-//                    ]
-//                );
-//        }
-
         foreach ($this->operations as $operation) {
             $programCounter = $this->calculateProgramCounterByOperationCodes(
                 $this->operations,
diff --git a/src/Compiler/Builder/Segments/Attributes/Attributes.php b/src/Compiler/Builder/Segments/Attributes/Attributes.php
@@ -14,21 +14,13 @@ public function build(): void
             // Write attribute_name_index
             $this->binaryWriter->writeUnsignedShort($attribute->getConstantPoolIndex());
 
+            $value = $attribute->getValue();
+
             // Write attribute_length
-            $this->binaryWriter->writeUnsignedInt(strlen($attribute->getValue()));
+            $this->binaryWriter->writeUnsignedInt(strlen($value));
 
             // Write attribute
-            $this->binaryWriter->write($attribute->getValue());
-
-            if (!$attribute->hasAttribute()) {
-                continue;
-            }
-
-            // Write attributes_count
-            AttributesCount::init($attribute->getAttributes(), $this->constantPool, $this->binaryWriter);
-
-            // Write attributes
-            Attributes::init($attribute->getAttributes(), $this->constantPool, $this->binaryWriter);
+            $this->binaryWriter->write($value);
         }
     }
 }
