Merge pull request #140 from php-java/string/intern-freezable

chitoku-k · web-flow · commit be65f0d5302f · 2019-05-10T11:03:57.000+09:00
Add FreezableInterface to manage the _Utf8
diff --git a/src/Core/JVM/ConstantPool.php b/src/Core/JVM/ConstantPool.php
@@ -19,6 +19,7 @@
 use PHPJava\Kernel\Structures\_NameAndType;
 use PHPJava\Kernel\Structures\_String;
 use PHPJava\Kernel\Structures\_Utf8;
+use PHPJava\Kernel\Structures\FreezableInterface;
 use PHPJava\Kernel\Structures\StructureInterface;
 
 class ConstantPool implements \ArrayAccess, \Countable, \IteratorAggregate
@@ -110,6 +111,9 @@ public function offsetExists($offset)
      */
     public function offsetGet($offset)
     {
+        if ($this->entries[$offset] instanceof FreezableInterface) {
+            $this->entries[$offset]->freeze();
+        }
         return $this->entries[$offset];
     }
 
diff --git a/src/Kernel/Structures/FreezableInterface.php b/src/Kernel/Structures/FreezableInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPJava\Kernel\Structures;
+
+interface FreezableInterface
+{
+    public function freeze(): void;
+}
diff --git a/src/Kernel/Structures/_Utf8.php b/src/Kernel/Structures/_Utf8.php
@@ -5,15 +5,16 @@
 use PHPJava\Exceptions\ReadOnlyException;
 use PHPJava\Utilities\BinaryTool;
 
-class _Utf8 implements StructureInterface
+class _Utf8 implements StructureInterface, FreezableInterface
 {
     use \PHPJava\Kernel\Core\BinaryReader;
     use \PHPJava\Kernel\Core\ConstantPool;
     use \PHPJava\Kernel\Core\DebugTool;
 
     private $length = 0;
     private $string = '';
-    private $isWritable = false;
+    private $isWritable = null;
+    private $isFrozen = false;
 
     /**
      * @var \PHPJava\Packages\java\lang\_String $stringObject
@@ -29,39 +30,46 @@ public function execute(): void
         $this->stringObject = new \PHPJava\Packages\java\lang\_String($this);
     }
 
-    public function getLength()
+    public function getLength(): int
     {
         return $this->length;
     }
 
-    /**
-     * @param bool $enable
-     * @return _Utf8
-     */
     public function enableWrite(bool $enable): self
     {
-        $this->isWritable = $enable;
+        if (!$this->isFrozen) {
+            $this->isWritable = $enable;
+        }
         return $this;
     }
 
-    public function getString()
+    public function freeze(): void
+    {
+        $this->isFrozen = true;
+        $this->enableWrite(false);
+    }
+
+    public function getString(): string
     {
         return $this->string;
     }
 
-    public function __toString(): string
+    public function getStringObject(): \PHPJava\Packages\java\lang\_String
     {
-        return $this->getString();
+        return $this->stringObject;
     }
 
     public function setStringObject(\PHPJava\Packages\java\lang\_String $stringObject): self
     {
-        $this->stringObject = $stringObject;
+        if ($this->isWritable) {
+            $this->stringObject = $stringObject;
+            $this->freeze();
+        }
         return $this;
     }
 
-    public function getStringObject(): \PHPJava\Packages\java\lang\_String
+    public function __toString(): string
     {
-        return $this->stringObject;
+        return $this->getString();
     }
 }
diff --git a/src/Packages/java/lang/_String.php b/src/Packages/java/lang/_String.php
@@ -363,8 +363,7 @@ public function intern(ConstantPool $cp)
             if ((string) $value === (string) $this->object) {
                 $this->object = $value
                     ->enableWrite(true)
-                    ->setStringObject($this)
-                    ->enableWrite(false);
+                    ->setStringObject($this);
                 break;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,16 @@`
`5`	`5`	`use PHPJava\Exceptions\ReadOnlyException;`
`6`	`6`	`use PHPJava\Utilities\BinaryTool;`
`7`	`7`
`8`		`-class _Utf8 implements StructureInterface`
	`8`	`+class _Utf8 implements StructureInterface, FreezableInterface`
`9`	`9`	`{`
`10`	`10`	`use \PHPJava\Kernel\Core\BinaryReader;`
`11`	`11`	`use \PHPJava\Kernel\Core\ConstantPool;`
`12`	`12`	`use \PHPJava\Kernel\Core\DebugTool;`
`13`	`13`
`14`	`14`	`private $length = 0;`
`15`	`15`	`private $string = '';`
`16`		`- private $isWritable = false;`
	`16`	`+ private $isWritable = null;`
	`17`	`+ private $isFrozen = false;`
`17`	`18`
`18`	`19`	`/**`
`19`	`20`	`* @var \PHPJava\Packages\java\lang\_String $stringObject`
`@@ -29,39 +30,46 @@ public function execute(): void`
`29`	`30`	`$this->stringObject = new \PHPJava\Packages\java\lang\_String($this);`
`30`	`31`	`}`
`31`	`32`
`32`		`- public function getLength()`
	`33`	`+ public function getLength(): int`
`33`	`34`	`{`
`34`	`35`	`return $this->length;`
`35`	`36`	`}`
`36`	`37`
`37`		`- /**`
`38`		`- * @param bool $enable`
`39`		`- * @return _Utf8`
`40`		`- */`
`41`	`38`	`public function enableWrite(bool $enable): self`
`42`	`39`	`{`
`43`		`- $this->isWritable = $enable;`
	`40`	`+ if (!$this->isFrozen) {`
	`41`	`+ $this->isWritable = $enable;`
	`42`	`+ }`
`44`	`43`	`return $this;`
`45`	`44`	`}`
`46`	`45`
`47`		`- public function getString()`
	`46`	`+ public function freeze(): void`
	`47`	`+ {`
	`48`	`+ $this->isFrozen = true;`
	`49`	`+ $this->enableWrite(false);`
	`50`	`+ }`
	`51`	`+`
	`52`	`+ public function getString(): string`
`48`	`53`	`{`
`49`	`54`	`return $this->string;`
`50`	`55`	`}`
`51`	`56`
`52`		`- public function __toString(): string`
	`57`	`+ public function getStringObject(): \PHPJava\Packages\java\lang\_String`
`53`	`58`	`{`
`54`		`- return $this->getString();`
	`59`	`+ return $this->stringObject;`
`55`	`60`	`}`
`56`	`61`
`57`	`62`	`public function setStringObject(\PHPJava\Packages\java\lang\_String $stringObject): self`
`58`	`63`	`{`
`59`		`- $this->stringObject = $stringObject;`
	`64`	`+ if ($this->isWritable) {`
	`65`	`+ $this->stringObject = $stringObject;`
	`66`	`+ $this->freeze();`
	`67`	`+ }`
`60`	`68`	`return $this;`
`61`	`69`	`}`
`62`	`70`
`63`		`- public function getStringObject(): \PHPJava\Packages\java\lang\_String`
	`71`	`+ public function __toString(): string`
`64`	`72`	`{`
`65`		`- return $this->stringObject;`
	`73`	`+ return $this->getString();`
`66`	`74`	`}`
`67`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -363,8 +363,7 @@ public function intern(ConstantPool $cp)`
`363`	`363`	`if ((string) $value === (string) $this->object) {`
`364`	`364`	`$this->object = $value`
`365`	`365`	`->enableWrite(true)`
`366`		`- ->setStringObject($this)`
`367`		`- ->enableWrite(false);`
	`366`	`+ ->setStringObject($this);`
`368`	`367`	`break;`
`369`	`368`	`}`
`370`	`369`	`}`