Update

m3m0r7 · m3m0r7 · commit 718a68cf00a9 · 2019-05-01T12:16:16.000+09:00
diff --git a/src/Kernel/Core/DependencyInjector.php b/src/Kernel/Core/DependencyInjector.php
@@ -30,7 +30,7 @@ private function getNativeAnnotateInjections(string $phpDocument): array
                 /**
                  * @var \phpDocumentor\Reflection\DocBlock\Tags\Generic $native
                  */
-                $injections[] = $this->dependencyInjectionProvider->get($native);
+                $injections[] = $this->dependencyInjectionProvider->get(trim($native));
             }
             return $injections;
         }
diff --git a/src/Kernel/Mnemonics/_aaload.php b/src/Kernel/Mnemonics/_aaload.php
@@ -16,7 +16,7 @@ final class _aaload implements OperationInterface
      */
     public function execute(): void
     {
-        $index = Extractor::realValue($this->popFromOperandStack());
+        $index = Extractor::getRealValue($this->popFromOperandStack());
         $arrayref = $this->popFromOperandStack();
 
         $this->pushToOperandStack(
diff --git a/src/Kernel/Mnemonics/_castore.php b/src/Kernel/Mnemonics/_castore.php
@@ -13,8 +13,8 @@ final class _castore implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue($this->popFromOperandStack());
-        $index = Extractor::realValue($this->popFromOperandStack());
+        $value = Extractor::getRealValue($this->popFromOperandStack());
+        $index = Extractor::getRealValue($this->popFromOperandStack());
 
         /**
          * @var Type $arrayref
diff --git a/src/Kernel/Mnemonics/_d2f.php b/src/Kernel/Mnemonics/_d2f.php
@@ -13,7 +13,7 @@ final class _d2f implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_d2i.php b/src/Kernel/Mnemonics/_d2i.php
@@ -13,7 +13,7 @@ final class _d2i implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_d2l.php b/src/Kernel/Mnemonics/_d2l.php
@@ -13,7 +13,7 @@ final class _d2l implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_f2d.php b/src/Kernel/Mnemonics/_f2d.php
@@ -13,7 +13,7 @@ final class _f2d implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_f2i.php b/src/Kernel/Mnemonics/_f2i.php
@@ -13,7 +13,7 @@ final class _f2i implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_f2l.php b/src/Kernel/Mnemonics/_f2l.php
@@ -13,7 +13,7 @@ final class _f2l implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_i2b.php b/src/Kernel/Mnemonics/_i2b.php
@@ -13,7 +13,7 @@ final class _i2b implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_i2c.php b/src/Kernel/Mnemonics/_i2c.php
@@ -13,7 +13,7 @@ final class _i2c implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_i2d.php b/src/Kernel/Mnemonics/_i2d.php
@@ -13,7 +13,7 @@ final class _i2d implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_i2f.php b/src/Kernel/Mnemonics/_i2f.php
@@ -13,7 +13,7 @@ final class _i2f implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_i2l.php b/src/Kernel/Mnemonics/_i2l.php
@@ -13,7 +13,7 @@ final class _i2l implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_i2s.php b/src/Kernel/Mnemonics/_i2s.php
@@ -13,7 +13,7 @@ final class _i2s implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_iadd.php b/src/Kernel/Mnemonics/_iadd.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Int(
                 BinaryTool::add(
-                    Extractor::realValue($leftValue),
-                    Extractor::realValue($rightValue)
+                    Extractor::getRealValue($leftValue),
+                    Extractor::getRealValue($rightValue)
                 )
             )
         );
diff --git a/src/Kernel/Mnemonics/_iaload.php b/src/Kernel/Mnemonics/_iaload.php
@@ -13,7 +13,7 @@ final class _iaload implements OperationInterface
 
     public function execute(): void
     {
-        $index = Extractor::realValue($this->popFromOperandStack());
+        $index = Extractor::getRealValue($this->popFromOperandStack());
         $arrayref = $this->popFromOperandStack();
 
         $this->pushToOperandStack(
diff --git a/src/Kernel/Mnemonics/_iand.php b/src/Kernel/Mnemonics/_iand.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Int(
                 BinaryTool::andBits(
-                    Extractor::realValue($value1),
-                    Extractor::realValue($value2),
+                    Extractor::getRealValue($value1),
+                    Extractor::getRealValue($value2),
                     4
                 )
             )
diff --git a/src/Kernel/Mnemonics/_iastore.php b/src/Kernel/Mnemonics/_iastore.php
@@ -14,8 +14,8 @@ final class _iastore implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue($this->popFromOperandStack());
-        $index = Extractor::realValue($this->popFromOperandStack());
+        $value = Extractor::getRealValue($this->popFromOperandStack());
+        $index = Extractor::getRealValue($this->popFromOperandStack());
 
         /**
          * @var Type $arrayref
diff --git a/src/Kernel/Mnemonics/_idiv.php b/src/Kernel/Mnemonics/_idiv.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Double(
                 BinaryTool::div(
-                    Extractor::realValue($value1),
-                    Extractor::realValue($value2)
+                    Extractor::getRealValue($value1),
+                    Extractor::getRealValue($value2)
                 )
             )
         );
diff --git a/src/Kernel/Mnemonics/_if_acmpeq.php b/src/Kernel/Mnemonics/_if_acmpeq.php
@@ -6,6 +6,7 @@
 use PHPJava\Kernel\Structures\_String;
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _if_acmpeq implements OperationInterface
 {
@@ -20,18 +21,10 @@ public function execute(): void
          * @var $rightOperand _String|_Utf8|JavaClass
          * @var $leftOperand _String|_Utf8|JavaClass
          */
-        $rightComparingValue = $rightOperand = $this->popFromOperandStack();
-        $leftComparingValue = $leftOperand = $this->popFromOperandStack();
+        $rightOperand = Extractor::extractUtf8IfThisIsString($this->popFromOperandStack());
+        $leftOperand = Extractor::extractUtf8IfThisIsString($this->popFromOperandStack());
 
-        if (method_exists($rightComparingValue, 'hashCode')) {
-            $rightComparingValue = $rightComparingValue->hashCode();
-        }
-
-        if (method_exists($leftComparingValue, 'hashCode')) {
-            $leftComparingValue = $leftComparingValue->hashCode();
-        }
-
-        if ($leftComparingValue === $rightComparingValue) {
+        if ($leftOperand === $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
         }
     }
diff --git a/src/Kernel/Mnemonics/_if_acmpne.php b/src/Kernel/Mnemonics/_if_acmpne.php
@@ -6,6 +6,7 @@
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Packages\java\lang\_String;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _if_acmpne implements OperationInterface
 {
@@ -20,18 +21,10 @@ public function execute(): void
          * @var $rightOperand _String|_Utf8|JavaClass
          * @var $leftOperand _String|_Utf8|JavaClass
          */
-        $rightComparingValue = $rightOperand = $this->popFromOperandStack();
-        $leftComparingValue = $leftOperand = $this->popFromOperandStack();
+        $rightOperand = Extractor::extractUtf8IfThisIsString($this->popFromOperandStack());
+        $leftOperand = Extractor::extractUtf8IfThisIsString($this->popFromOperandStack());
 
-        if (method_exists($rightComparingValue, 'hashCode')) {
-            $rightComparingValue = $rightComparingValue->hashCode();
-        }
-
-        if (method_exists($leftComparingValue, 'hashCode')) {
-            $leftComparingValue = $leftComparingValue->hashCode();
-        }
-
-        if ($leftComparingValue !== $rightComparingValue) {
+        if ($leftOperand !== $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
         }
     }
diff --git a/src/Kernel/Mnemonics/_if_icmpge.php b/src/Kernel/Mnemonics/_if_icmpge.php
@@ -14,8 +14,8 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $rightOperand = Extractor::realValue($this->popFromOperandStack());
-        $leftOperand = Extractor::realValue($this->popFromOperandStack());
+        $rightOperand = Extractor::getRealValue($this->popFromOperandStack());
+        $leftOperand = Extractor::getRealValue($this->popFromOperandStack());
 
         if ($leftOperand >= $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_if_icmpgt.php b/src/Kernel/Mnemonics/_if_icmpgt.php
@@ -14,8 +14,8 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $rightOperand = Extractor::realValue($this->popFromOperandStack());
-        $leftOperand = Extractor::realValue($this->popFromOperandStack());
+        $rightOperand = Extractor::getRealValue($this->popFromOperandStack());
+        $leftOperand = Extractor::getRealValue($this->popFromOperandStack());
 
         if ($leftOperand > $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_if_icmple.php b/src/Kernel/Mnemonics/_if_icmple.php
@@ -14,8 +14,8 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $rightOperand = Extractor::realValue($this->popFromOperandStack());
-        $leftOperand = Extractor::realValue($this->popFromOperandStack());
+        $rightOperand = Extractor::getRealValue($this->popFromOperandStack());
+        $leftOperand = Extractor::getRealValue($this->popFromOperandStack());
 
         if ($leftOperand <= $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_ifne.php b/src/Kernel/Mnemonics/_ifne.php
@@ -14,7 +14,7 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $operand = Extractor::realValue($this->popFromOperandStack());
+        $operand = Extractor::getRealValue($this->popFromOperandStack());
 
         if ($operand != 0) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_iinc.php b/src/Kernel/Mnemonics/_iinc.php
@@ -16,7 +16,7 @@ public function execute(): void
         $index = $this->readUnsignedByte();
         $const = $this->readByte();
 
-        $value = Extractor::realValue($this->getLocalStorage($index));
+        $value = Extractor::getRealValue($this->getLocalStorage($index));
 
         $this->setLocalStorage($index, new _Int($value + $const));
     }
diff --git a/src/Kernel/Mnemonics/_imul.php b/src/Kernel/Mnemonics/_imul.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Int(
                 BinaryTool::multiply(
-                    Extractor::realValue($value1),
-                    Extractor::realValue($value2)
+                    Extractor::getRealValue($value1),
+                    Extractor::getRealValue($value2)
                 )
             )
         );
diff --git a/src/Kernel/Mnemonics/_ior.php b/src/Kernel/Mnemonics/_ior.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Int(
                 BinaryTool::orBits(
-                    Extractor::realValue($value1),
-                    Extractor::realValue($value2),
+                    Extractor::getRealValue($value1),
+                    Extractor::getRealValue($value2),
                     4
                 )
             )
diff --git a/src/Kernel/Mnemonics/_irem.php b/src/Kernel/Mnemonics/_irem.php
@@ -16,8 +16,8 @@ public function execute(): void
         // JVM spec wrote `value1 - (value1 / value2) * value2`
         // But PHP can modulo calculation.
 
-        $rightOperand = Extractor::realValue($this->popFromOperandStack());
-        $leftOperand = Extractor::realValue($this->popFromOperandStack());
+        $rightOperand = Extractor::getRealValue($this->popFromOperandStack());
+        $leftOperand = Extractor::getRealValue($this->popFromOperandStack());
 
         $this->pushToOperandStack(
             new _Int(
diff --git a/src/Kernel/Mnemonics/_ishl.php b/src/Kernel/Mnemonics/_ishl.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Int(
                 BinaryTool::shiftLeft(
-                    Extractor::realValue($value1),
-                    Extractor::realValue($value2)
+                    Extractor::getRealValue($value1),
+                    Extractor::getRealValue($value2)
                 )
             )
         );
diff --git a/src/Kernel/Mnemonics/_ishr.php b/src/Kernel/Mnemonics/_ishr.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Int(
                 BinaryTool::shiftRight(
-                    Extractor::realValue($value1),
-                    Extractor::realValue($value2),
+                    Extractor::getRealValue($value1),
+                    Extractor::getRealValue($value2),
                     4
                 )
             )
diff --git a/src/Kernel/Mnemonics/_isub.php b/src/Kernel/Mnemonics/_isub.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Int(
                 BinaryTool::sub(
-                    Extractor::realValue($leftValue),
-                    Extractor::realValue($rightValue)
+                    Extractor::getRealValue($leftValue),
+                    Extractor::getRealValue($rightValue)
                 )
             )
         );
diff --git a/src/Kernel/Mnemonics/_iushr.php b/src/Kernel/Mnemonics/_iushr.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Int(
                 BinaryTool::unsignedShiftRight(
-                    Extractor::realValue($value1),
-                    Extractor::realValue($value2),
+                    Extractor::getRealValue($value1),
+                    Extractor::getRealValue($value2),
                     4
                 )
             )
diff --git a/src/Kernel/Mnemonics/_ixor.php b/src/Kernel/Mnemonics/_ixor.php
@@ -19,8 +19,8 @@ public function execute(): void
         $this->pushToOperandStack(
             new _Int(
                 BinaryTool::xorBits(
-                    Extractor::realValue($value1),
-                    Extractor::realValue($value2),
+                    Extractor::getRealValue($value1),
+                    Extractor::getRealValue($value2),
                     4
                 )
             )
diff --git a/src/Kernel/Mnemonics/_l2d.php b/src/Kernel/Mnemonics/_l2d.php
@@ -13,7 +13,7 @@ final class _l2d implements OperationInterface
 
     public function execute(): void
     {
-        $value = Extractor::realValue(
+        $value = Extractor::getRealValue(
             $this->popFromOperandStack()
         );
 
diff --git a/src/Kernel/Mnemonics/_l2f.php b/src/Kernel/Mnemonics/_l2f.php
diff --git a/src/Kernel/Mnemonics/_l2i.php b/src/Kernel/Mnemonics/_l2i.php
diff --git a/src/Kernel/Mnemonics/_ladd.php b/src/Kernel/Mnemonics/_ladd.php
diff --git a/src/Kernel/Mnemonics/_ldiv.php b/src/Kernel/Mnemonics/_ldiv.php
diff --git a/src/Kernel/Mnemonics/_lmul.php b/src/Kernel/Mnemonics/_lmul.php
diff --git a/src/Kernel/Mnemonics/_lookupswitch.php b/src/Kernel/Mnemonics/_lookupswitch.php
diff --git a/src/Kernel/Mnemonics/_lsub.php b/src/Kernel/Mnemonics/_lsub.php
diff --git a/src/Kernel/Mnemonics/_newarray.php b/src/Kernel/Mnemonics/_newarray.php
diff --git a/src/Kernel/Mnemonics/_tableswitch.php b/src/Kernel/Mnemonics/_tableswitch.php
diff --git a/src/Kernel/Types/_Array/Collection.php b/src/Kernel/Types/_Array/Collection.php
diff --git a/src/Utilities/Extractor.php b/src/Utilities/Extractor.php

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ private function getNativeAnnotateInjections(string $phpDocument): array`
`30`	`30`	`/**`
`31`	`31`	`* @var \phpDocumentor\Reflection\DocBlock\Tags\Generic $native`
`32`	`32`	`*/`
`33`		`- $injections[] = $this->dependencyInjectionProvider->get($native);`
	`33`	`+ $injections[] = $this->dependencyInjectionProvider->get(trim($native));`
`34`	`34`	`}`
`35`	`35`	`return $injections;`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ final class _aaload implements OperationInterface`
`16`	`16`	`*/`
`17`	`17`	`public function execute(): void`
`18`	`18`	`{`
`19`		`- $index = Extractor::realValue($this->popFromOperandStack());`
	`19`	`+ $index = Extractor::getRealValue($this->popFromOperandStack());`
`20`	`20`	`$arrayref = $this->popFromOperandStack();`
`21`	`21`
`22`	`22`	`$this->pushToOperandStack(`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ final class _castore implements OperationInterface`
`13`	`13`
`14`	`14`	`public function execute(): void`
`15`	`15`	`{`
`16`		`- $value = Extractor::realValue($this->popFromOperandStack());`
`17`		`- $index = Extractor::realValue($this->popFromOperandStack());`
	`16`	`+ $value = Extractor::getRealValue($this->popFromOperandStack());`
	`17`	`+ $index = Extractor::getRealValue($this->popFromOperandStack());`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* @var Type $arrayref`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class _d2f implements OperationInterface`
`13`	`13`
`14`	`14`	`public function execute(): void`
`15`	`15`	`{`
`16`		`- $value = Extractor::realValue(`
	`16`	`+ $value = Extractor::getRealValue(`
`17`	`17`	`$this->popFromOperandStack()`
`18`	`18`	`);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class _d2i implements OperationInterface`
`13`	`13`
`14`	`14`	`public function execute(): void`
`15`	`15`	`{`
`16`		`- $value = Extractor::realValue(`
	`16`	`+ $value = Extractor::getRealValue(`
`17`	`17`	`$this->popFromOperandStack()`
`18`	`18`	`);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class _d2l implements OperationInterface`
`13`	`13`
`14`	`14`	`public function execute(): void`
`15`	`15`	`{`
`16`		`- $value = Extractor::realValue(`
	`16`	`+ $value = Extractor::getRealValue(`
`17`	`17`	`$this->popFromOperandStack()`
`18`	`18`	`);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class _f2d implements OperationInterface`
`13`	`13`
`14`	`14`	`public function execute(): void`
`15`	`15`	`{`
`16`		`- $value = Extractor::realValue(`
	`16`	`+ $value = Extractor::getRealValue(`
`17`	`17`	`$this->popFromOperandStack()`
`18`	`18`	`);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class _f2i implements OperationInterface`
`13`	`13`
`14`	`14`	`public function execute(): void`
`15`	`15`	`{`
`16`		`- $value = Extractor::realValue(`
	`16`	`+ $value = Extractor::getRealValue(`
`17`	`17`	`$this->popFromOperandStack()`
`18`	`18`	`);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class _f2l implements OperationInterface`
`13`	`13`
`14`	`14`	`public function execute(): void`
`15`	`15`	`{`
`16`		`- $value = Extractor::realValue(`
	`16`	`+ $value = Extractor::getRealValue(`
`17`	`17`	`$this->popFromOperandStack()`
`18`	`18`	`);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ final class _i2b implements OperationInterface`
`13`	`13`
`14`	`14`	`public function execute(): void`
`15`	`15`	`{`
`16`		`- $value = Extractor::realValue(`
	`16`	`+ $value = Extractor::getRealValue(`
`17`	`17`	`$this->popFromOperandStack()`
`18`	`18`	`);`
`19`	`19`