to use necromancy to _Utf8

m3m0r7 · m3m0r7 · commit e66f72582a3b · 2019-05-01T16:42:10.000+09:00
diff --git a/src/Kernel/Mnemonics/_if_acmpeq.php b/src/Kernel/Mnemonics/_if_acmpeq.php
@@ -21,8 +21,8 @@ public function execute(): void
          * @var $rightOperand _String|_Utf8|JavaClass
          * @var $leftOperand _String|_Utf8|JavaClass
          */
-        $rightOperand = Extractor::extractUtf8IfThisIsString($this->popFromOperandStack());
-        $leftOperand = Extractor::extractUtf8IfThisIsString($this->popFromOperandStack());
+        $rightOperand = $this->popFromOperandStack();
+        $leftOperand = $this->popFromOperandStack();
 
         if ($leftOperand === $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_if_acmpne.php b/src/Kernel/Mnemonics/_if_acmpne.php
@@ -21,8 +21,8 @@ public function execute(): void
          * @var $rightOperand _String|_Utf8|JavaClass
          * @var $leftOperand _String|_Utf8|JavaClass
          */
-        $rightOperand = Extractor::extractUtf8IfThisIsString($this->popFromOperandStack());
-        $leftOperand = Extractor::extractUtf8IfThisIsString($this->popFromOperandStack());
+        $rightOperand = $this->popFromOperandStack();
+        $leftOperand = $this->popFromOperandStack();
 
         if ($leftOperand !== $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_ldc.php b/src/Kernel/Mnemonics/_ldc.php
@@ -25,7 +25,7 @@ public function execute(): void
             $value = $cpInfo[$data->getStringIndex()];
 
             if ($value instanceof _Utf8) {
-                $value = new \PHPJava\Packages\java\lang\_String($value);
+                $value = $value->getStringObject();
             }
         } elseif (($data instanceof _Integer) || ($data instanceof _Float)) {
             $value = $data->getBytes();
diff --git a/src/Kernel/Structures/_Utf8.php b/src/Kernel/Structures/_Utf8.php
@@ -12,12 +12,19 @@ class _Utf8 implements StructureInterface
 
     private $length = 0;
     private $string = '';
+
+    /**
+     * @var \PHPJava\Packages\java\lang\_String $stringObject
+     */
+    private $stringObject;
+
     public function execute(): void
     {
         $this->length = $this->readUnsignedShort();
         for ($i = 0; $i < $this->length; $i++) {
             $this->string .= chr($this->readUnsignedByte());
         }
+        $this->stringObject = new \PHPJava\Packages\java\lang\_String($this);
     }
 
     public function getLength()
@@ -30,8 +37,13 @@ public function getString()
         return $this->string;
     }
 
-    public function hashCode()
+    public function __toString(): string
+    {
+        return $this->getString();
+    }
+
+    public function getStringObject(): \PHPJava\Packages\java\lang\_String
     {
-        return spl_object_id($this);
+        return $this->stringObject;
     }
 }
diff --git a/src/Utilities/Extractor.php b/src/Utilities/Extractor.php
@@ -7,24 +7,22 @@
 
 class Extractor
 {
-    public static function getRealValue($value)
+    /**
+     * You need to use `getRealValue` instead of `realValue`.
+     *
+     * @deprecated
+     * @param $value
+     * @return array|bool|float|int|null|Type|string
+     */
+    public static function realValue($value)
     {
-        if ($value instanceof Type) {
-            return $value->getValue();
-        }
-        return $value;
+        return static::getRealValue($value);
     }
 
-    public static function extractUtf8IfThisIsString($value)
+    public static function getRealValue($value)
     {
-        if ($value instanceof _String) {
-            // NOTE: "object" property can be access from ReflectionProperty only.
-            $reflectionProperty = (new \ReflectionClass($value))->getProperty('object');
-            $reflectionProperty->setAccessible(true);
-            $result = $reflectionProperty->getValue($value);
-            if ($result instanceof _Utf8) {
-                return $result;
-            }
+        if ($value instanceof Type) {
+            return $value->getValue();
         }
         return $value;
     }
diff --git a/src/Utilities/TypeResolver.php b/src/Utilities/TypeResolver.php
@@ -5,6 +5,7 @@
 use PHPJava\Core\JVM\Parameters\GlobalOptions;
 use PHPJava\Core\JVM\Parameters\Runtime;
 use PHPJava\Exceptions\TypeException;
+use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Packages\java\lang\_Object;
 use PHPJava\Packages\java\lang\_String;
 use PHPJava\Kernel\Types\_Array\Collection;
@@ -150,6 +151,13 @@ public static function convertPHPtoJava($arguments, $defaultJavaArgumentType = '
                     'deep_array' => $deepArray,
                 ];
             }
+            if ($arguments instanceof _Utf8) {
+                return [
+                    'type' => 'class',
+                    'class_name' => static::PHP_TO_JAVA_MAP['string'],
+                    'deep_array' => $deepArray,
+                ];
+            }
             if ($arguments instanceof Type) {
                 return [
                     'type' => $arguments->getTypeNameInJava(),

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function execute(): void`
`25`	`25`	`$value = $cpInfo[$data->getStringIndex()];`
`26`	`26`
`27`	`27`	`if ($value instanceof _Utf8) {`
`28`		`- $value = new \PHPJava\Packages\java\lang\_String($value);`
	`28`	`+ $value = $value->getStringObject();`
`29`	`29`	`}`
`30`	`30`	`} elseif (($data instanceof _Integer) \|\| ($data instanceof _Float)) {`
`31`	`31`	`$value = $data->getBytes();`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,19 @@ class _Utf8 implements StructureInterface`
`12`	`12`
`13`	`13`	`private $length = 0;`
`14`	`14`	`private $string = '';`
	`15`	`+`
	`16`	`+ /**`
	`17`	`+ * @var \PHPJava\Packages\java\lang\_String $stringObject`
	`18`	`+ */`
	`19`	`+ private $stringObject;`
	`20`	`+`
`15`	`21`	`public function execute(): void`
`16`	`22`	`{`
`17`	`23`	`$this->length = $this->readUnsignedShort();`
`18`	`24`	`for ($i = 0; $i < $this->length; $i++) {`
`19`	`25`	`$this->string .= chr($this->readUnsignedByte());`
`20`	`26`	`}`
	`27`	`+ $this->stringObject = new \PHPJava\Packages\java\lang\_String($this);`
`21`	`28`	`}`
`22`	`29`
`23`	`30`	`public function getLength()`
`@@ -30,8 +37,13 @@ public function getString()`
`30`	`37`	`return $this->string;`
`31`	`38`	`}`
`32`	`39`
`33`		`- public function hashCode()`
	`40`	`+ public function __toString(): string`
	`41`	`+ {`
	`42`	`+ return $this->getString();`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ public function getStringObject(): \PHPJava\Packages\java\lang\_String`
`34`	`46`	`{`
`35`		`- return spl_object_id($this);`
	`47`	`+ return $this->stringObject;`
`36`	`48`	`}`
`37`	`49`	`}`