Merge pull request #137 from php-java/allow-to-overwrite-the-constantpool

m3m0r7 · web-flow · commit 28927248053b · 2019-05-09T10:37:14.000+09:00
Allow to overwrite the Constant Pool
diff --git a/src/Core/JVM/ConstantPool.php b/src/Core/JVM/ConstantPool.php
@@ -122,6 +122,8 @@ public function count()
     }
 
     /**
+     * @param mixed $offset
+     * @param mixed $value
      * @throws ReadOnlyException
      */
     public function offsetSet($offset, $value)
@@ -130,6 +132,7 @@ public function offsetSet($offset, $value)
     }
 
     /**
+     * @param mixed $offset
      * @throws ReadOnlyException
      */
     public function offsetUnset($offset)
diff --git a/src/Core/JVM/Intern/InternInterface.php b/src/Core/JVM/Intern/InternInterface.php
diff --git a/src/Core/JVM/Intern/StringIntern.php b/src/Core/JVM/Intern/StringIntern.php
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -4,7 +4,6 @@
 use PHPJava\Core\JVM\AttributePool;
 use PHPJava\Core\JVM\FieldPool;
 use PHPJava\Core\JVM\InterfacePool;
-use PHPJava\Core\JVM\Intern\StringIntern;
 use PHPJava\Core\JVM\MethodPool;
 use PHPJava\Core\JVM\ConstantPool;
 use PHPJava\Core\JVM\Parameters\GlobalOptions;
diff --git a/src/Core/JavaClassInvoker.php b/src/Core/JavaClassInvoker.php
@@ -3,7 +3,6 @@
 
 use PHPJava\Core\JVM\DynamicAccessor;
 use PHPJava\Core\JVM\Field\FieldInterface;
-use PHPJava\Core\JVM\Intern\StringIntern;
 use PHPJava\Core\JVM\Invoker\Invokable;
 use PHPJava\Core\JVM\Invoker\InvokerInterface;
 use PHPJava\Core\JVM\Parameters\GlobalOptions;
@@ -12,7 +11,6 @@
 use PHPJava\Exceptions\IllegalJavaClassException;
 use PHPJava\Kernel\Maps\FieldAccessFlag;
 use PHPJava\Kernel\Maps\OpCode;
-use PHPJava\Kernel\Provider\InternProvider;
 use PHPJava\Kernel\Provider\ProviderInterface;
 use PHPJava\Kernel\Structures\_FieldInfo;
 use PHPJava\Kernel\Structures\_MethodInfo;
@@ -91,15 +89,6 @@ public function __construct(
             }
         }
 
-        // Intern provider registration.
-        $this->providers = [
-            'InternProvider' => (new InternProvider())
-                ->add(
-                    StringIntern::class,
-                    new StringIntern()
-                ),
-        ];
-
         $this->dynamicAccessor = new DynamicAccessor(
             $this,
             $this->dynamicMethods,
diff --git a/src/Kernel/Mnemonics/_aload.php b/src/Kernel/Mnemonics/_aload.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Core\JVM\Intern\StringIntern;
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Utilities\BinaryTool;
 
@@ -16,10 +15,6 @@ final class _aload implements OperationInterface
     public function execute(): void
     {
         $index = $this->readByte();
-        $stringIntern = $this->javaClassInvoker
-            ->getProvider('InternProvider')
-            ->get(StringIntern::class);
-        $internedValue = $stringIntern[spl_object_id($this->getLocalStorage($index))] ?? null;
-        $this->pushToOperandStack($internedValue ?: $this->getLocalStorage($index));
+        $this->pushToOperandStack($this->getLocalStorage($index));
     }
 }
diff --git a/src/Kernel/Mnemonics/_aload_0.php b/src/Kernel/Mnemonics/_aload_0.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Core\JVM\Intern\StringIntern;
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Packages\java\lang\_Object;
 use PHPJava\Utilities\BinaryTool;
@@ -17,10 +16,6 @@ final class _aload_0 implements OperationInterface
     public function execute(): void
     {
         $index = 0;
-        $stringIntern = $this->javaClassInvoker
-            ->getProvider('InternProvider')
-            ->get(StringIntern::class);
-        $internedValue = $stringIntern[spl_object_id($this->getLocalStorage($index))] ?? null;
-        $this->pushToOperandStack($internedValue ?: $this->getLocalStorage($index));
+        $this->pushToOperandStack($this->getLocalStorage($index));
     }
 }
diff --git a/src/Kernel/Mnemonics/_aload_1.php b/src/Kernel/Mnemonics/_aload_1.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Core\JVM\Intern\StringIntern;
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Packages\java\lang\_Object;
 use PHPJava\Utilities\BinaryTool;
@@ -17,10 +16,6 @@ final class _aload_1 implements OperationInterface
     public function execute(): void
     {
         $index = 1;
-        $stringIntern = $this->javaClassInvoker
-            ->getProvider('InternProvider')
-            ->get(StringIntern::class);
-        $internedValue = $stringIntern[spl_object_id($this->getLocalStorage($index))] ?? null;
-        $this->pushToOperandStack($internedValue ?: $this->getLocalStorage($index));
+        $this->pushToOperandStack($this->getLocalStorage($index));
     }
 }
diff --git a/src/Kernel/Mnemonics/_aload_2.php b/src/Kernel/Mnemonics/_aload_2.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Core\JVM\Intern\StringIntern;
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Packages\java\lang\_Object;
 use PHPJava\Utilities\BinaryTool;
@@ -17,10 +16,6 @@ final class _aload_2 implements OperationInterface
     public function execute(): void
     {
         $index = 2;
-        $stringIntern = $this->javaClassInvoker
-            ->getProvider('InternProvider')
-            ->get(StringIntern::class);
-        $internedValue = $stringIntern[spl_object_id($this->getLocalStorage($index))] ?? null;
-        $this->pushToOperandStack($internedValue ?: $this->getLocalStorage($index));
+        $this->pushToOperandStack($this->getLocalStorage($index));
     }
 }
diff --git a/src/Kernel/Mnemonics/_aload_3.php b/src/Kernel/Mnemonics/_aload_3.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Core\JVM\Intern\StringIntern;
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Utilities\BinaryTool;
 
@@ -16,10 +15,6 @@ final class _aload_3 implements OperationInterface
     public function execute(): void
     {
         $index = 3;
-        $stringIntern = $this->javaClassInvoker
-            ->getProvider('InternProvider')
-            ->get(StringIntern::class);
-        $internedValue = $stringIntern[spl_object_id($this->getLocalStorage($index))] ?? null;
-        $this->pushToOperandStack($internedValue ?: $this->getLocalStorage($index));
+        $this->pushToOperandStack($this->getLocalStorage($index));
     }
 }
diff --git a/src/Kernel/Provider/InternProvider.php b/src/Kernel/Provider/InternProvider.php
diff --git a/src/Kernel/Structures/_Utf8.php b/src/Kernel/Structures/_Utf8.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Structures;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Exceptions\ReadOnlyException;
 use PHPJava\Utilities\BinaryTool;
 
 class _Utf8 implements StructureInterface
@@ -12,6 +13,7 @@ class _Utf8 implements StructureInterface
 
     private $length = 0;
     private $string = '';
+    private $isWritable = false;
 
     /**
      * @var \PHPJava\Packages\java\lang\_String $stringObject
@@ -32,6 +34,16 @@ public function getLength()
         return $this->length;
     }
 
+    /**
+     * @param bool $enable
+     * @return _Utf8
+     */
+    public function enableWrite(bool $enable): self
+    {
+        $this->isWritable = $enable;
+        return $this;
+    }
+
     public function getString()
     {
         return $this->string;
@@ -42,6 +54,12 @@ public function __toString(): string
         return $this->getString();
     }
 
+    public function setStringObject(\PHPJava\Packages\java\lang\_String $stringObject): self
+    {
+        $this->stringObject = $stringObject;
+        return $this;
+    }
+
     public function getStringObject(): \PHPJava\Packages\java\lang\_String
     {
         return $this->stringObject;
diff --git a/src/Packages/java/lang/_String.php b/src/Packages/java/lang/_String.php
@@ -1,7 +1,9 @@
 <?php
 namespace PHPJava\Packages\java\lang;
 
+use PHPJava\Core\JVM\ConstantPool;
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Exceptions\ReadOnlyException;
 use PHPJava\Packages\java\lang\IndexOutOfBoundsException;
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Kernel\Types\_Char;
@@ -344,14 +346,29 @@ public function indexOf($a = null, $b = null)
     /**
      * Returns a canonical representation for the string object.
      *
-     * @param mixed $a
+     * @native ConstantPool
      * @return mixed
-     * @throws NotImplementedException
      * @see https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/package-summary.html#intern
      */
-    public function intern($a = null)
-    {
-        throw new NotImplementedException(__METHOD__);
+    public function intern(ConstantPool $cp)
+    {
+        // Find the string from the Constant Pool.
+        foreach ($cp as $key => $value) {
+            if (!($value instanceof _Utf8)) {
+                continue;
+            }
+            /**
+             * @var _Utf8 $value
+             */
+            if ((string) $value === (string) $this->object) {
+                $this->object = $value
+                    ->enableWrite(true)
+                    ->setStringObject($this)
+                    ->enableWrite(false);
+                break;
+            }
+        }
+        return $this;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ public function count()`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`/**`
	`125`	`+ * @param mixed $offset`
	`126`	`+ * @param mixed $value`
`125`	`127`	`* @throws ReadOnlyException`
`126`	`128`	`*/`
`127`	`129`	`public function offsetSet($offset, $value)`
`@@ -130,6 +132,7 @@ public function offsetSet($offset, $value)`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`/**`
	`135`	`+ * @param mixed $offset`
`133`	`136`	`* @throws ReadOnlyException`
`134`	`137`	`*/`
`135`	`138`	`public function offsetUnset($offset)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPJava\Kernel\Mnemonics;`
`3`	`3`
`4`		`-use PHPJava\Core\JVM\Intern\StringIntern;`
`5`	`4`	`use PHPJava\Exceptions\NotImplementedException;`
`6`	`5`	`use PHPJava\Utilities\BinaryTool;`
`7`	`6`
`@@ -16,10 +15,6 @@ final class _aload implements OperationInterface`
`16`	`15`	`public function execute(): void`
`17`	`16`	`{`
`18`	`17`	`$index = $this->readByte();`
`19`		`- $stringIntern = $this->javaClassInvoker`
`20`		`- ->getProvider('InternProvider')`
`21`		`- ->get(StringIntern::class);`
`22`		`- $internedValue = $stringIntern[spl_object_id($this->getLocalStorage($index))] ?? null;`
`23`		`- $this->pushToOperandStack($internedValue ?: $this->getLocalStorage($index));`
	`18`	`+ $this->pushToOperandStack($this->getLocalStorage($index));`
`24`	`19`	`}`
`25`	`20`	`}`