Fix mnemonics and wrap Kernel\Types for scalar values

m3m0r7 · m3m0r7 · commit 257fc9be864e · 2019-04-05T13:32:32.000+09:00
diff --git a/src/Kernel/Mnemonics/_iadd.php b/src/Kernel/Mnemonics/_iadd.php
@@ -4,6 +4,7 @@
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Kernel\Types\_Int;
 use PHPJava\Utilities\BinaryTool;
+use PHPJava\Utilities\Extractor;
 
 final class _iadd implements OperationInterface
 {
@@ -15,14 +16,13 @@ public function execute(): void
         $rightValue = $this->getStack();
         $leftValue = $this->getStack();
 
-        if ($leftValue instanceof _Int) {
-            $leftValue = $leftValue->getValue();
-        }
-
-        if ($rightValue instanceof _Int) {
-            $rightValue = $rightValue->getValue();
-        }
-
-        $this->pushStack(BinaryTool::add($leftValue, $rightValue));
+        $this->pushStack(
+            new _Int(
+                BinaryTool::add(
+                    Extractor::realValue($leftValue),
+                    Extractor::realValue($rightValue)
+                )
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_idiv.php b/src/Kernel/Mnemonics/_idiv.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 _idiv implements OperationInterface
 {
@@ -11,6 +13,16 @@ final class _idiv implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value2 = $this->getStack();
+        $value1 = $this->getStack();
+
+        $this->pushStack(
+            new _Double(
+                BinaryTool::div(
+                    Extractor::realValue($value1),
+                    Extractor::realValue($value2)
+                )
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_imul.php b/src/Kernel/Mnemonics/_imul.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 _imul implements OperationInterface
 {
@@ -14,6 +16,13 @@ public function execute(): void
         $value2 = $this->getStack();
         $value1 = $this->getStack();
 
-        $this->pushStack(BinaryTool::multiply($value1, $value2, 4));
+        $this->pushStack(
+            new _Int(
+                BinaryTool::multiply(
+                    Extractor::realValue($value1),
+                    Extractor::realValue($value2)
+                )
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_ireturn.php b/src/Kernel/Mnemonics/_ireturn.php
@@ -15,6 +15,9 @@ final class _ireturn implements OperationInterface
      */
     public function execute()
     {
-        return new _Int($this->getStack());
+        $value = $this->getStack();
+        return ($value instanceof _Int)
+            ? $value
+            : new _Int($value);
     }
 }
diff --git a/src/Kernel/Mnemonics/_isub.php b/src/Kernel/Mnemonics/_isub.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 _isub implements OperationInterface
 {
@@ -14,6 +16,13 @@ public function execute(): void
         $rightValue = $this->getStack();
         $leftValue = $this->getStack();
 
-        $this->pushStack(BinaryTool::sub($leftValue, $rightValue, 4));
+        $this->pushStack(
+            new _Int(
+                BinaryTool::sub(
+                    Extractor::realValue($leftValue),
+                    Extractor::realValue($rightValue)
+                )
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_ladd.php b/src/Kernel/Mnemonics/_ladd.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 _ladd implements OperationInterface
 {
@@ -14,6 +16,13 @@ public function execute(): void
         $value2 = $this->getStack();
         $value1 = $this->getStack();
 
-        $this->pushStack(BinaryTool::add($value1, $value2));
+        $this->pushStack(
+            new _Long(
+                BinaryTool::add(
+                    Extractor::realValue($value1),
+                    Extractor::realValue($value2)
+                )
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_ldiv.php b/src/Kernel/Mnemonics/_ldiv.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 _ldiv implements OperationInterface
 {
@@ -11,6 +13,16 @@ final class _ldiv implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $value2 = $this->getStack();
+        $value1 = $this->getStack();
+
+        $this->pushStack(
+            new _Double(
+                BinaryTool::div(
+                    Extractor::realValue($value1),
+                    Extractor::realValue($value2)
+                )
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_lmul.php b/src/Kernel/Mnemonics/_lmul.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 _lmul implements OperationInterface
 {
@@ -14,6 +16,13 @@ public function execute(): void
         $value2 = $this->getStack();
         $value1 = $this->getStack();
 
-        $this->pushStack(BinaryTool::multiply($value1, $value2, 8));
+        $this->pushStack(
+            new _Long(
+                BinaryTool::multiply(
+                    Extractor::realValue($value1),
+                    Extractor::realValue($value2)
+                )
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_lreturn.php b/src/Kernel/Mnemonics/_lreturn.php
@@ -2,15 +2,19 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Long;
 use PHPJava\Utilities\BinaryTool;
 
 final class _lreturn implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
     use \PHPJava\Kernel\Core\ConstantPool;
 
-    public function execute(): void
+    public function execute()
     {
-        return new JavaTypeLong($this->getStack());
+        $value = $this->getStack();
+        return ($value instanceof _Long)
+            ? $value
+            : new _Long($value);
     }
 }
diff --git a/src/Kernel/Mnemonics/_lsub.php b/src/Kernel/Mnemonics/_lsub.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 _lsub implements OperationInterface
 {
@@ -14,6 +16,13 @@ public function execute(): void
         $value2 = $this->getStack();
         $value1 = $this->getStack();
 
-        $this->pushStack(BinaryTool::sub($value1, $value2, 8));
+        $this->pushStack(
+            new _Long(
+                BinaryTool::sub(
+                    Extractor::realValue($value1),
+                    Extractor::realValue($value2)
+                )
+            )
+        );
     }
 }
diff --git a/src/Kernel/Types/Type.php b/src/Kernel/Types/Type.php
@@ -1,12 +1,25 @@
 <?php
 namespace PHPJava\Kernel\Types;
 
+use PHPJava\Exceptions\TypeException;
+
 class Type
 {
     private $value = null;
 
     public function __construct($value)
     {
+        // Validate value which is scalar.
+        if (
+            !is_int($value) &&
+            !is_float($value) &&
+            !is_string($value) &&
+            !is_bool($value)
+        ) {
+            throw new TypeException(
+                'Passed value is not scalar. The value is "' . gettype($value) . '"'
+            );
+        }
         $this->value = $value;
     }
 
diff --git a/src/Utilities/BinaryTool.php b/src/Utilities/BinaryTool.php
@@ -66,10 +66,8 @@ final public static function negate($value, $bytes)
         return ($convert[0] === '1' ? '-' : '') . base_convert($convert, 2, 10);
     }
 
-    final public static function multiply($value1, $value2, $bytes)
+    final public static function multiply($value1, $value2)
     {
-        $value1 = (int) $value1;
-        $value2 = (int) $value2;
         if (function_exists('gmp_mul')) {
             $a = gmp_init($value1);
             $b = gmp_init($value2);
@@ -81,8 +79,6 @@ final public static function multiply($value1, $value2, $bytes)
 
     final public static function add($value1, $value2)
     {
-        $value1 = (int) $value1;
-        $value2 = (int) $value2;
         if (function_exists('gmp_add')) {
             $a = gmp_init($value1);
             $b = gmp_init($value2);
@@ -92,10 +88,8 @@ final public static function add($value1, $value2)
         return $value1 + $value2;
     }
 
-    final public static function sub($value1, $value2, $bytes)
+    final public static function sub($value1, $value2)
     {
-        $value1 = (int) $value1;
-        $value2 = (int) $value2;
         if (function_exists('gmp_sub')) {
             $a = gmp_init($value1);
             $b = gmp_init($value2);
@@ -105,10 +99,8 @@ final public static function sub($value1, $value2, $bytes)
         return $value1 - $value2;
     }
 
-    final public static function div($value1, $value2, $bytes)
+    final public static function div($value1, $value2)
     {
-        $value1 = (int) $value1;
-        $value2 = (int) $value2;
         if (function_exists('gmp_div')) {
             $a = gmp_init($value1);
             $b = gmp_init($value2);
diff --git a/src/Utilities/Extractor.php b/src/Utilities/Extractor.php
@@ -0,0 +1,15 @@
+<?php
+namespace PHPJava\Utilities;
+
+use PHPJava\Kernel\Types\Type;
+
+class Extractor
+{
+    public static function realValue($value)
+    {
+        if ($value instanceof Type) {
+            return $value->getValue();
+        }
+        return $value;
+    }
+}

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\_Double;`
`5`	`6`	`use PHPJava\Utilities\BinaryTool;`
	`7`	`+use PHPJava\Utilities\Extractor;`
`6`	`8`
`7`	`9`	`final class _idiv implements OperationInterface`
`8`	`10`	`{`
`@@ -11,6 +13,16 @@ final class _idiv implements OperationInterface`
`11`	`13`
`12`	`14`	`public function execute(): void`
`13`	`15`	`{`
`14`		`- throw new NotImplementedException(__CLASS__);`
	`16`	`+ $value2 = $this->getStack();`
	`17`	`+ $value1 = $this->getStack();`
	`18`	`+`
	`19`	`+ $this->pushStack(`
	`20`	`+ new _Double(`
	`21`	`+ BinaryTool::div(`
	`22`	`+ Extractor::realValue($value1),`
	`23`	`+ Extractor::realValue($value2)`
	`24`	`+ )`
	`25`	`+ )`
	`26`	`+ );`
`15`	`27`	`}`
`16`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@ final class _ireturn implements OperationInterface`
`15`	`15`	`*/`
`16`	`16`	`public function execute()`
`17`	`17`	`{`
`18`		`- return new _Int($this->getStack());`
	`18`	`+ $value = $this->getStack();`
	`19`	`+ return ($value instanceof _Int)`
	`20`	`+ ? $value`
	`21`	`+ : new _Int($value);`
`19`	`22`	`}`
`20`	`23`	`}`
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\_Long;`
`5`	`6`	`use PHPJava\Utilities\BinaryTool;`
`6`	`7`
`7`	`8`	`final class _lreturn 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 JavaTypeLong($this->getStack());`
	`15`	`+ $value = $this->getStack();`
	`16`	`+ return ($value instanceof _Long)`
	`17`	`+ ? $value`
	`18`	`+ : new _Long($value);`
`15`	`19`	`}`
`16`	`20`	`}`