Use ArrayAccess instead of getEntries on ConstantPool

m3m0r7 · m3m0r7 · commit 0aaf36bde0c1 · 2019-04-10T13:35:50.000+09:00
diff --git a/src/Core/JVM/ConstantPool.php b/src/Core/JVM/ConstantPool.php
@@ -3,6 +3,7 @@
 
 use PHPJava\Core\Stream\Reader\ReaderInterface;
 use PHPJava\Exceptions\ReadEntryException;
+use PHPJava\Exceptions\ReadOnlyException;
 use PHPJava\Kernel\Maps\ConstantPoolTag;
 use PHPJava\Kernel\Structures\_Class;
 use PHPJava\Kernel\Structures\_Double;
@@ -19,7 +20,7 @@
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Kernel\Structures\StructureInterface;
 
-class ConstantPool
+class ConstantPool implements \ArrayAccess
 {
     private $entries = [];
     private $reader;
@@ -90,4 +91,24 @@ private function read($entryTag): ?StructureInterface
         }
         throw new ReadEntryException('Entry tag ' . sprintf('0x%04X', $entryTag) . ' is not defined.');
     }
+
+    public function offsetExists($offset)
+    {
+        return isset($this->entries[$offset]);
+    }
+
+    public function offsetGet($offset)
+    {
+        return $this->entries[$offset];
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        throw new ReadOnlyException('You cannot rewrite datum. The Constant Pool is read-only.');
+    }
+
+    public function offsetUnset($offset)
+    {
+        throw new ReadOnlyException('You cannot rewrite datum. The Constant Pool is read-only.');
+    }
 }
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -138,7 +138,7 @@ public function __construct(ReaderInterface $reader, array $options = [])
         // read super class
         $this->superClassIndex = $reader->getBinaryReader()->readUnsignedShort();
 
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         [$resolvedType, $superClass] = ClassResolver::resolve(
             $cpInfo[$cpInfo[$this->superClassIndex]->getClassIndex()]->getString(),
             $this
@@ -283,7 +283,7 @@ public function getSuperClass()
 
     public function debug(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         foreach ($this->debugTraces as $debugTraces) {
             printf("[method]\n");
             printf(Formatter::beatifyMethodFromConstantPool($debugTraces['method'], $this->getConstantPool()) . "\n");
diff --git a/src/Core/JavaClassInvoker.php b/src/Core/JavaClassInvoker.php
@@ -53,7 +53,7 @@ public function __construct(JavaClass $javaClass, array $options)
     {
         $this->javaClass = $javaClass;
         $this->options = $options;
-        $cpInfo = $javaClass->getConstantPool()->getEntries();
+        $cpInfo = $javaClass->getConstantPool();
 
         foreach ($javaClass->getMethods() as $methodInfo) {
             /**
diff --git a/src/Exceptions/ReadOnlyException.php b/src/Exceptions/ReadOnlyException.php
@@ -0,0 +1,6 @@
+<?php
+namespace PHPJava\Exceptions;
+
+class ReadOnlyException extends \Exception
+{
+}
diff --git a/src/Kernel/Attributes/AttributeInfo.php b/src/Kernel/Attributes/AttributeInfo.php
@@ -21,7 +21,7 @@ public function execute(): void
     {
         $this->attributeNameIndex = $this->readUnsignedShort();
         $this->attributeLength = $this->readUnsignedInt();
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         $currentOffset = $this->getOffset();
 
         $attributeName = $cpInfo[$this->attributeNameIndex]->getString();
diff --git a/src/Kernel/Mnemonics/_athrow.php b/src/Kernel/Mnemonics/_athrow.php
@@ -11,7 +11,7 @@ final class _athrow implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
 
         $objectref = $this->popFromOperandStack();
 
diff --git a/src/Kernel/Mnemonics/_getfield.php b/src/Kernel/Mnemonics/_getfield.php
@@ -11,7 +11,7 @@ final class _getfield implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
 
         $cp = $cpInfo[$this->readUnsignedShort()];
 
diff --git a/src/Kernel/Mnemonics/_getstatic.php b/src/Kernel/Mnemonics/_getstatic.php
@@ -14,7 +14,7 @@ final class _getstatic implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         
         $cp = $cpInfo[$this->readUnsignedShort()];
         $class = $cpInfo[$cpInfo[$cp->getClassIndex()]->getClassIndex()]->getString();
diff --git a/src/Kernel/Mnemonics/_invokespecial.php b/src/Kernel/Mnemonics/_invokespecial.php
@@ -14,7 +14,7 @@ final class _invokespecial implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         $cp = $cpInfo[$this->readUnsignedShort()];
         $nameAndTypeIndex = $cpInfo[$cp->getNameAndTypeIndex()];
         $signature = $cpInfo[$nameAndTypeIndex->getDescriptorIndex()]->getString();
diff --git a/src/Kernel/Mnemonics/_invokestatic.php b/src/Kernel/Mnemonics/_invokestatic.php
@@ -13,7 +13,7 @@ final class _invokestatic implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         $cp = $cpInfo[$this->readUnsignedShort()];
         $methodName = $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString();
         $signature = Formatter::parseSignature($cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getDescriptorIndex()]->getString());
diff --git a/src/Kernel/Mnemonics/_invokevirtual.php b/src/Kernel/Mnemonics/_invokevirtual.php
@@ -16,7 +16,7 @@ final class _invokevirtual implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         $cp = $cpInfo[$this->readUnsignedShort()];
         $class = $cpInfo[$cpInfo[$cp->getClassIndex()]->getClassIndex()]->getString();
         $nameAndTypeIndex = $cpInfo[$cp->getNameAndTypeIndex()];
diff --git a/src/Kernel/Mnemonics/_ldc.php b/src/Kernel/Mnemonics/_ldc.php
@@ -15,7 +15,7 @@ final class _ldc implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
 
         $data = $cpInfo[$this->readUnsignedByte()];
 
diff --git a/src/Kernel/Mnemonics/_ldc2_w.php b/src/Kernel/Mnemonics/_ldc2_w.php
@@ -11,7 +11,7 @@ final class _ldc2_w implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
 
         $data = $cpInfo[$this->readUnsignedShort()];
 
diff --git a/src/Kernel/Mnemonics/_new.php b/src/Kernel/Mnemonics/_new.php
@@ -12,7 +12,7 @@ final class _new implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         $class = $cpInfo[$this->readUnsignedShort()];
         $className = $cpInfo[$class->getClassIndex()]->getString();
         if ($className === $this->javaClass->getClassName()) {
diff --git a/src/Kernel/Mnemonics/_putfield.php b/src/Kernel/Mnemonics/_putfield.php
@@ -11,7 +11,7 @@ final class _putfield implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         $cp = $cpInfo[$this->readUnsignedShort()];
         $class = $cpInfo[$cp->getNameAndTypeIndex()];
 
diff --git a/src/Kernel/Mnemonics/_putstatic.php b/src/Kernel/Mnemonics/_putstatic.php
@@ -11,7 +11,7 @@ final class _putstatic implements OperationInterface
 
     public function execute(): void
     {
-        $cpInfo = $this->getConstantPool()->getEntries();
+        $cpInfo = $this->getConstantPool();
         
         $cp = $cpInfo[$this->readUnsignedShort()];
         
diff --git a/src/Utilities/SuperClassResolver.php b/src/Utilities/SuperClassResolver.php
@@ -13,7 +13,7 @@ class SuperClassResolver
 
     public function resolveMethod($methodName, JavaClass $class)
     {
-        $cpInfo = $class->getConstantPool()->getEntries();
+        $cpInfo = $class->getConstantPool();
         if ($class->getSuperClass() instanceof JavaClass) {
             foreach ($class->getSuperClass()->getInvoker()->getDynamic()->getMethods()->getList() as $calleeMethodName => $callee) {
                 if ($methodName !== $calleeMethodName) {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function __construct(JavaClass $javaClass, array $options)`
`53`	`53`	`{`
`54`	`54`	`$this->javaClass = $javaClass;`
`55`	`55`	`$this->options = $options;`
`56`		`- $cpInfo = $javaClass->getConstantPool()->getEntries();`
	`56`	`+ $cpInfo = $javaClass->getConstantPool();`
`57`	`57`
`58`	`58`	`foreach ($javaClass->getMethods() as $methodInfo) {`
`59`	`59`	`/**`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<?php
 +namespace PHPJava\Exceptions;
++
 +class ReadOnlyException extends \Exception
 +{
 +}
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function execute(): void`
`21`	`21`	`{`
`22`	`22`	`$this->attributeNameIndex = $this->readUnsignedShort();`
`23`	`23`	`$this->attributeLength = $this->readUnsignedInt();`
`24`		`- $cpInfo = $this->getConstantPool()->getEntries();`
	`24`	`+ $cpInfo = $this->getConstantPool();`
`25`	`25`	`$currentOffset = $this->getOffset();`
`26`	`26`
`27`	`27`	`$attributeName = $cpInfo[$this->attributeNameIndex]->getString();`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ final class _athrow implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $cpInfo = $this->getConstantPool()->getEntries();`
	`14`	`+ $cpInfo = $this->getConstantPool();`
`15`	`15`
`16`	`16`	`$objectref = $this->popFromOperandStack();`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ final class _getfield implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $cpInfo = $this->getConstantPool()->getEntries();`
	`14`	`+ $cpInfo = $this->getConstantPool();`
`15`	`15`
`16`	`16`	`$cp = $cpInfo[$this->readUnsignedShort()];`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ final class _getstatic implements OperationInterface`
`14`	`14`
`15`	`15`	`public function execute(): void`
`16`	`16`	`{`
`17`		`- $cpInfo = $this->getConstantPool()->getEntries();`
	`17`	`+ $cpInfo = $this->getConstantPool();`
`18`	`18`
`19`	`19`	`$cp = $cpInfo[$this->readUnsignedShort()];`
`20`	`20`	`$class = $cpInfo[$cpInfo[$cp->getClassIndex()]->getClassIndex()]->getString();`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ final class _invokespecial implements OperationInterface`
`14`	`14`
`15`	`15`	`public function execute(): void`
`16`	`16`	`{`
`17`		`- $cpInfo = $this->getConstantPool()->getEntries();`
	`17`	`+ $cpInfo = $this->getConstantPool();`
`18`	`18`	`$cp = $cpInfo[$this->readUnsignedShort()];`
`19`	`19`	`$nameAndTypeIndex = $cpInfo[$cp->getNameAndTypeIndex()];`
`20`	`20`	`$signature = $cpInfo[$nameAndTypeIndex->getDescriptorIndex()]->getString();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class _invokestatic implements OperationInterface`
`13`	`13`
`14`	`14`	`public function execute(): void`
`15`	`15`	`{`
`16`		`- $cpInfo = $this->getConstantPool()->getEntries();`
	`16`	`+ $cpInfo = $this->getConstantPool();`
`17`	`17`	`$cp = $cpInfo[$this->readUnsignedShort()];`
`18`	`18`	`$methodName = $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString();`
`19`	`19`	`$signature = Formatter::parseSignature($cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getDescriptorIndex()]->getString());`