WIP

m3m0r7 · m3m0r7 · commit 3ea4b0041653 · 2019-04-06T01:33:08.000+09:00
diff --git a/src/Kernel/Structures/Annotations/Annotation.php b/src/Kernel/Structures/Annotations/Annotation.php
@@ -19,10 +19,14 @@ public function execute(): void
         $this->numElementValuePairs = $this->readUnsignedShort();
 
         for ($i = 0; $i < $this->numElementValuePairs; $i++) {
+            $elementNameIndex = $this->readUnsignedShort();
             $elementValuePair = (new ElementValuePairs($this->reader))
                 ->setConstantPool($this->getConstantPool());
             $elementValuePair->execute();
-            $this->elementValuePairs[] = $elementValuePair;
+            $this->elementValuePairs[] = [
+                'element_name_index' => $elementNameIndex,
+                'element_value_pair' => $elementValuePair,
+            ];
         }
     }
 }
diff --git a/src/Kernel/Structures/Annotations/ElementValuePairs.php b/src/Kernel/Structures/Annotations/ElementValuePairs.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Structures\Annotations;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Attributes\AttributeInfo;
 use PHPJava\Kernel\Attributes\RuntimeVisibleAnnotationsAttribute;
 use PHPJava\Utilities\BinaryTool;
 
@@ -11,12 +12,10 @@ final class ElementValuePairs implements AnnotationInterface
     use \PHPJava\Kernel\Core\ConstantPool;
 
     private $tag;
-    private $elementNameIndex = null;
 
     public function execute(): void
     {
-        $this->elementNameIndex = $this->readUnsignedShort();
-        $this->tag = $this->readByte();
+        $this->tag = chr($this->readByte());
 
         $this->constValueIndex = $this->readUnsignedShort();
 
@@ -28,20 +27,24 @@ public function execute(): void
 
         $this->classInfoIndex = $this->readUnsignedShort();
 
-        $this->annotationValue = new RuntimeVisibleAnnotationsAttribute($this->reader);
-        $this->annotationValue->setConstantPool($this->getConstantPool());
-        $this->annotationValue->execute();
+        $cpInfo = $this->getConstantPool()->getEntries();
 
-        $this->arrayValue = [
-            'num_values' => $this->readUnsignedShort(),
+        if ($this->tag === '@') {
+            $this->annotationValue = new AttributeInfo($this->reader);
+            $this->annotationValue->setConstantPool($this->getConstantPool());
+            $this->annotationValue->execute();
+        }
 
-        ];
+        if ($this->tag === '[') {
+            $this->arrayValue = [
+                'num_values' => $this->readUnsignedShort(),
+
+            ];
+        }
 //
 //        for ($i = 0; $i < $this->arrayValue['num_values']; $i++) {
 //
 //        }
 
-        var_dump($this->arrayValue);
-        exit();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,14 @@ public function execute(): void`
`19`	`19`	`$this->numElementValuePairs = $this->readUnsignedShort();`
`20`	`20`
`21`	`21`	`for ($i = 0; $i < $this->numElementValuePairs; $i++) {`
	`22`	`+ $elementNameIndex = $this->readUnsignedShort();`
`22`	`23`	`$elementValuePair = (new ElementValuePairs($this->reader))`
`23`	`24`	`->setConstantPool($this->getConstantPool());`
`24`	`25`	`$elementValuePair->execute();`
`25`		`- $this->elementValuePairs[] = $elementValuePair;`
	`26`	`+ $this->elementValuePairs[] = [`
	`27`	`+ 'element_name_index' => $elementNameIndex,`
	`28`	`+ 'element_value_pair' => $elementValuePair,`
	`29`	`+ ];`
`26`	`30`	`}`
`27`	`31`	`}`
`28`	`32`	`}`