Merge branch 'master' of github.com:memory-agape/php-java

m3m0r7 · m3m0r7 · commit df2ffb1e5cd2 · 2019-04-19T16:25:27.000+09:00
diff --git a/src/Kernel/Mnemonics/_d2f.php b/src/Kernel/Mnemonics/_d2f.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Float;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _d2f implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _d2f implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Float($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_d2i.php b/src/Kernel/Mnemonics/_d2i.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Int;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _d2i implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _d2i implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Int($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_d2l.php b/src/Kernel/Mnemonics/_d2l.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Long;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _d2l implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _d2l implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Long($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_dreturn.php b/src/Kernel/Mnemonics/_dreturn.php
@@ -2,15 +2,19 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Double;
 use PHPJava\Utilities\BinaryTool;
 
 final class _dreturn implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
     use \PHPJava\Kernel\Core\ConstantPool;
 
-    public function execute(): void
+    public function execute()
     {
-        return new JavaTypeDouble($this->popFromOperandStack());
+        $value = $this->popFromOperandStack();
+        return ($value instanceof _Double)
+            ? $value
+            : new _Double($value);
     }
 }
diff --git a/src/Kernel/Mnemonics/_f2d.php b/src/Kernel/Mnemonics/_f2d.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Double;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _f2d implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _f2d implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Double($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_f2i.php b/src/Kernel/Mnemonics/_f2i.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Int;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _f2i implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _f2i implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Int($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_f2l.php b/src/Kernel/Mnemonics/_f2l.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Long;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _f2l implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _f2l implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Long($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_fload.php b/src/Kernel/Mnemonics/_fload.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Float;
 use PHPJava\Utilities\BinaryTool;
 
 final class _fload implements OperationInterface
@@ -11,6 +12,11 @@ final class _fload implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $index = $this->readUnsignedByte();
+        $this->pushToOperandStack(
+            new _Float(
+                $this->getLocalStorage($index)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_fload_0.php b/src/Kernel/Mnemonics/_fload_0.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Float;
 use PHPJava\Utilities\BinaryTool;
 
 final class _fload_0 implements OperationInterface
@@ -11,6 +12,10 @@ final class _fload_0 implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $this->pushToOperandStack(
+            new _Float(
+                $this->getLocalStorage(0)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_fload_1.php b/src/Kernel/Mnemonics/_fload_1.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Float;
 use PHPJava\Utilities\BinaryTool;
 
 final class _fload_1 implements OperationInterface
@@ -11,6 +12,10 @@ final class _fload_1 implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $this->pushToOperandStack(
+            new _Float(
+                $this->getLocalStorage(1)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_fload_2.php b/src/Kernel/Mnemonics/_fload_2.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Float;
 use PHPJava\Utilities\BinaryTool;
 
 final class _fload_2 implements OperationInterface
@@ -11,6 +12,10 @@ final class _fload_2 implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $this->pushToOperandStack(
+            new _Float(
+                $this->getLocalStorage(2)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_fload_3.php b/src/Kernel/Mnemonics/_fload_3.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Float;
 use PHPJava\Utilities\BinaryTool;
 
 final class _fload_3 implements OperationInterface
@@ -11,6 +12,10 @@ final class _fload_3 implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $this->pushToOperandStack(
+            new _Float(
+                $this->getLocalStorage(3)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_freturn.php b/src/Kernel/Mnemonics/_freturn.php
@@ -2,15 +2,19 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Float;
 use PHPJava\Utilities\BinaryTool;
 
 final class _freturn implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
     use \PHPJava\Kernel\Core\ConstantPool;
 
-    public function execute(): void
+    public function execute()
     {
-        return new JavaTypeFloat($this->popFromOperandStack());
+        $value = $this->popFromOperandStack();
+        return ($value instanceof _Float)
+            ? $value
+            : new _Float($value);
     }
 }
diff --git a/src/Kernel/Mnemonics/_i2b.php b/src/Kernel/Mnemonics/_i2b.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Byte;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _i2b implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _i2b implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Byte($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_i2c.php b/src/Kernel/Mnemonics/_i2c.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Char;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _i2c implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _i2c implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Char($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_i2d.php b/src/Kernel/Mnemonics/_i2d.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Double;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _i2d implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _i2d implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Double($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_i2f.php b/src/Kernel/Mnemonics/_i2f.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Float;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _i2f implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _i2f implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Float($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_i2l.php b/src/Kernel/Mnemonics/_i2l.php
@@ -2,7 +2,9 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Long;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _i2l implements OperationInterface
 {
@@ -11,6 +13,10 @@ final class _i2l implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value = Extractor::realValue(
+            $this->popFromOperandStack()
+        );
+
+        $this->pushToOperandStack(new _Long($value));
     }
 }
diff --git a/src/Kernel/Mnemonics/_i2s.php b/src/Kernel/Mnemonics/_i2s.php
diff --git a/src/Kernel/Mnemonics/_l2d.php b/src/Kernel/Mnemonics/_l2d.php
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/tests/CastTest.php b/tests/CastTest.php
diff --git a/tests/fixtures/java/CastTest.java b/tests/fixtures/java/CastTest.java

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`	`namespace PHPJava\Kernel\Mnemonics;`
`3`	`3`
`4`	`4`	`use PHPJava\Exceptions\NotImplementedException;`
	`5`	`+use PHPJava\Kernel\Types\_Float;`
`5`	`6`	`use PHPJava\Utilities\BinaryTool;`
	`7`	`+use PHPJava\Utilities\Extractor;`
`6`	`8`
`7`	`9`	`final class _d2f implements OperationInterface`
`8`	`10`	`{`
`@@ -11,6 +13,10 @@ final class _d2f implements OperationInterface`
`11`	`13`
`12`	`14`	`public function execute(): void`
`13`	`15`	`{`
`14`		`- throw new NotImplementedException(__CLASS__);`
	`16`	`+ $value = Extractor::realValue(`
	`17`	`+ $this->popFromOperandStack()`
	`18`	`+ );`
	`19`	`+`
	`20`	`+ $this->pushToOperandStack(new _Float($value));`
`15`	`21`	`}`
`16`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,19 @@`
`2`	`2`	`namespace PHPJava\Kernel\Mnemonics;`
`3`	`3`
`4`	`4`	`use PHPJava\Exceptions\NotImplementedException;`
	`5`	`+use PHPJava\Kernel\Types\_Double;`
`5`	`6`	`use PHPJava\Utilities\BinaryTool;`
`6`	`7`
`7`	`8`	`final class _dreturn implements OperationInterface`
`8`	`9`	`{`
`9`	`10`	`use \PHPJava\Kernel\Core\Accumulator;`
`10`	`11`	`use \PHPJava\Kernel\Core\ConstantPool;`
`11`	`12`
`12`		`- public function execute(): void`
	`13`	`+ public function execute()`
`13`	`14`	`{`
`14`		`- return new JavaTypeDouble($this->popFromOperandStack());`
	`15`	`+ $value = $this->popFromOperandStack();`
	`16`	`+ return ($value instanceof _Double)`
	`17`	`+ ? $value`
	`18`	`+ : new _Double($value);`
`15`	`19`	`}`
`16`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`namespace PHPJava\Kernel\Mnemonics;`
`3`	`3`
`4`	`4`	`use PHPJava\Exceptions\NotImplementedException;`
	`5`	`+use PHPJava\Kernel\Types\_Float;`
`5`	`6`	`use PHPJava\Utilities\BinaryTool;`
`6`	`7`
`7`	`8`	`final class _fload implements OperationInterface`
`@@ -11,6 +12,11 @@ final class _fload implements OperationInterface`
`11`	`12`
`12`	`13`	`public function execute(): void`
`13`	`14`	`{`
`14`		`- throw new NotImplementedException(__CLASS__);`
	`15`	`+ $index = $this->readUnsignedByte();`
	`16`	`+ $this->pushToOperandStack(`
	`17`	`+ new _Float(`
	`18`	`+ $this->getLocalStorage($index)`
	`19`	`+ )`
	`20`	`+ );`
`15`	`21`	`}`
`16`	`22`	`}`