Fix mistaken attribution reading

m3m0r7 · m3m0r7 · commit fb88d1bcea26 · 2019-04-30T15:42:15.000+09:00
diff --git a/src/Kernel/Attributes/CodeAttribute.php b/src/Kernel/Attributes/CodeAttribute.php
@@ -40,11 +40,7 @@ public function execute(): void
             $exceptionTable = new \PHPJava\Kernel\Structures\_ExceptionTable($this->reader);
             $exceptionTable->setConstantPool($this->getConstantPool());
             $exceptionTable->setDebugTool($this->getDebugTool());
-            $exceptionTable->setStartPc($this->readUnsignedShort())
-                ->setEndPc($this->readUnsignedShort())
-                ->setHandlerPc($this->readUnsignedShort())
-                ->setCatchType($this->readUnsignedShort())
-                ->execute();
+            $exceptionTable->execute();
             $this->exceptionTables[] = $exceptionTable;
         }
 
diff --git a/src/Kernel/Attributes/LineNumberTableAttribute.php b/src/Kernel/Attributes/LineNumberTableAttribute.php
@@ -20,9 +20,7 @@ public function execute(): void
             $lineNumberTable = new \PHPJava\Kernel\Structures\_LineNumberTable($this->reader);
             $lineNumberTable->setConstantPool($this->getConstantPool());
             $lineNumberTable->setDebugTool($this->getDebugTool());
-            $lineNumberTable->setStartPc($this->readUnsignedShort())
-                ->setLineNumber($this->readUnsignedShort())
-                ->execute();
+            $lineNumberTable->execute();
             $this->lineNumberTables[] = $lineNumberTable;
         }
     }
diff --git a/src/Kernel/Structures/_ExceptionTable.php b/src/Kernel/Structures/_ExceptionTable.php
@@ -17,30 +17,10 @@ class _ExceptionTable implements StructureInterface
 
     public function execute(): void
     {
-    }
-
-    public function setStartPc($startPc)
-    {
-        $this->startPc = $startPc;
-        return $this;
-    }
-
-    public function setEndPc($endPc)
-    {
-        $this->endPc = $endPc;
-        return $this;
-    }
-
-    public function setHandlerPc($handlerPc)
-    {
-        $this->handlerPc = $handlerPc;
-        return $this;
-    }
-
-    public function setCatchType($catchType)
-    {
-        $this->catchType = $catchType;
-        return $this;
+        $this->startPc = $this->readUnsignedShort();
+        $this->endPc = $this->readUnsignedShort();
+        $this->handlerPc = $this->readUnsignedShort();
+        $this->catchType = $this->readUnsignedShort();
     }
 
     public function getStartPc()
diff --git a/src/Kernel/Structures/_LineNumberTable.php b/src/Kernel/Structures/_LineNumberTable.php
@@ -15,6 +15,8 @@ class _LineNumberTable implements StructureInterface
 
     public function execute(): void
     {
+        $this->startPc = $this->readUnsignedShort();
+        $this->lineNumber = $this->readUnsignedShort();
     }
 
     public function setStartPc($startPc)

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,7 @@ public function execute(): void`
`20`	`20`	`$lineNumberTable = new \PHPJava\Kernel\Structures\_LineNumberTable($this->reader);`
`21`	`21`	`$lineNumberTable->setConstantPool($this->getConstantPool());`
`22`	`22`	`$lineNumberTable->setDebugTool($this->getDebugTool());`
`23`		`- $lineNumberTable->setStartPc($this->readUnsignedShort())`
`24`		`- ->setLineNumber($this->readUnsignedShort())`
`25`		`- ->execute();`
	`23`	`+ $lineNumberTable->execute();`
`26`	`24`	`$this->lineNumberTables[] = $lineNumberTable;`
`27`	`25`	`}`
`28`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ class _LineNumberTable implements StructureInterface`
`15`	`15`
`16`	`16`	`public function execute(): void`
`17`	`17`	`{`
	`18`	`+ $this->startPc = $this->readUnsignedShort();`
	`19`	`+ $this->lineNumber = $this->readUnsignedShort();`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`public function setStartPc($startPc)`