Merge branch 'master' into 0.0.5.0

m3m0r7 · m3m0r7 · commit 0db74d731967 · 2019-04-05T00:51:35.000+09:00
diff --git a/src/Core/JavaArchive.php b/src/Core/JavaArchive.php
@@ -72,7 +72,7 @@ function ($fileName) {
         );
 
         foreach ($this->files as $className => $code) {
-            $this->classes[str_replace('/', '.', $className)] = new JavaClass(new JavaClassInlineReaderInterface(
+            $this->classes[str_replace('/', '.', $className)] = new JavaClass(new JavaClassInlineReader(
                 $className,
                 $code
             ));
diff --git a/src/Core/JavaClassInlineReader.php b/src/Core/JavaClassInlineReader.php
@@ -3,7 +3,7 @@
 
 use PHPJava\Utilities\ClassResolver;
 
-class JavaClassInlineReaderInterface implements JavaClassReaderInterface
+class JavaClassInlineReader implements JavaClassReaderInterface
 {
     private $fileName;
     private $handle;
diff --git a/src/Imitation/java/lang/Math.php b/src/Imitation/java/lang/Math.php
@@ -16,4 +16,16 @@ public static function abs($number)
     {
         return abs($number);
     }
+
+    /**
+     * This decrease 1 from parameters
+     *
+     * @see https://docs.oracle.com/javase/jp/8/docs/api/java/lang/Math.html#decrementExact-int-
+     * @param int $a
+     * @return int
+     */
+    public static function decrementExact($a)
+    {
+        return $a - 1;
+    }
 }
diff --git a/src/Kernel/Mnemonics/_dadd.php b/src/Kernel/Mnemonics/_dadd.php
@@ -11,8 +11,8 @@ final class _dadd implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::add($value1, $value2));
     }
diff --git a/src/Kernel/Mnemonics/_dmul.php b/src/Kernel/Mnemonics/_dmul.php
@@ -11,8 +11,8 @@ final class _dmul implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::multiply($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_dsub.php b/src/Kernel/Mnemonics/_dsub.php
@@ -11,8 +11,8 @@ final class _dsub implements OperationInterface
 
     public function execute(): void
     {
-        $leftValue = $this->getStack();
         $rightValue = $this->getStack();
+        $leftValue = $this->getStack();
 
         $this->pushStack(BinaryTool::sub($leftValue, $rightValue, 8));
     }
diff --git a/src/Kernel/Mnemonics/_iadd.php b/src/Kernel/Mnemonics/_iadd.php
@@ -11,8 +11,8 @@ final class _iadd implements OperationInterface
 
     public function execute(): void
     {
-        $leftValue = $this->getStack();
         $rightValue = $this->getStack();
+        $leftValue = $this->getStack();
 
         $this->pushStack(BinaryTool::add($leftValue, $rightValue));
     }
diff --git a/src/Kernel/Mnemonics/_iand.php b/src/Kernel/Mnemonics/_iand.php
@@ -11,8 +11,8 @@ final class _iand implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::andBits($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_if_acmpeq.php b/src/Kernel/Mnemonics/_if_acmpeq.php
@@ -13,8 +13,8 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
         if ($leftOperand === $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_if_acmpne.php b/src/Kernel/Mnemonics/_if_acmpne.php
@@ -13,8 +13,8 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
         if ($leftOperand !== $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_if_icmpge.php b/src/Kernel/Mnemonics/_if_icmpge.php
@@ -13,10 +13,10 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
-        if ($leftOperand <= $rightOperand) {
+        if ($leftOperand >= $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
         }
     }
diff --git a/src/Kernel/Mnemonics/_if_icmpgt.php b/src/Kernel/Mnemonics/_if_icmpgt.php
@@ -13,10 +13,10 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
-        if ($leftOperand < $rightOperand) {
+        if ($leftOperand > $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
         }
     }
diff --git a/src/Kernel/Mnemonics/_if_icmplt.php b/src/Kernel/Mnemonics/_if_icmplt.php
@@ -13,10 +13,10 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
-        if ($rightOperand < $leftOperand) {
+        if ($leftOperand < $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
         }
     }
diff --git a/src/Kernel/Mnemonics/_if_icmpne.php b/src/Kernel/Mnemonics/_if_icmpne.php
@@ -13,8 +13,8 @@ public function execute(): void
     {
         $offset = $this->readShort();
 
-        $leftOperand = $this->getStack();
         $rightOperand = $this->getStack();
+        $leftOperand = $this->getStack();
 
         if ($leftOperand != $rightOperand) {
             $this->setOffset($this->getProgramCounter() + $offset);
diff --git a/src/Kernel/Mnemonics/_imul.php b/src/Kernel/Mnemonics/_imul.php
@@ -11,8 +11,8 @@ final class _imul implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::multiply($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_ior.php b/src/Kernel/Mnemonics/_ior.php
@@ -11,8 +11,8 @@ final class _ior implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::orBits($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_ishl.php b/src/Kernel/Mnemonics/_ishl.php
@@ -11,8 +11,8 @@ final class _ishl implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::shiftLeft($value1, $value2));
     }
diff --git a/src/Kernel/Mnemonics/_ishr.php b/src/Kernel/Mnemonics/_ishr.php
@@ -11,8 +11,8 @@ final class _ishr implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::shiftRight($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_isub.php b/src/Kernel/Mnemonics/_isub.php
@@ -11,8 +11,8 @@ final class _isub implements OperationInterface
 
     public function execute(): void
     {
-        $leftValue = $this->getStack();
         $rightValue = $this->getStack();
+        $leftValue = $this->getStack();
 
         $this->pushStack(BinaryTool::sub($leftValue, $rightValue, 4));
     }
diff --git a/src/Kernel/Mnemonics/_iushr.php b/src/Kernel/Mnemonics/_iushr.php
@@ -11,8 +11,8 @@ final class _iushr implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::unsignedShiftRight($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_ixor.php b/src/Kernel/Mnemonics/_ixor.php
@@ -11,8 +11,8 @@ final class _ixor implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::xorBits($value1, $value2, 4));
     }
diff --git a/src/Kernel/Mnemonics/_ladd.php b/src/Kernel/Mnemonics/_ladd.php
@@ -11,8 +11,8 @@ final class _ladd implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::add($value1, $value2));
     }
diff --git a/src/Kernel/Mnemonics/_land.php b/src/Kernel/Mnemonics/_land.php
@@ -11,8 +11,8 @@ final class _land implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::andBits($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lmul.php b/src/Kernel/Mnemonics/_lmul.php
@@ -11,8 +11,8 @@ final class _lmul implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::multiply($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lor.php b/src/Kernel/Mnemonics/_lor.php
@@ -11,8 +11,8 @@ final class _lor implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::orBits($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lshl.php b/src/Kernel/Mnemonics/_lshl.php
@@ -11,8 +11,8 @@ final class _lshl implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::shiftLeft($value1, $value2));
     }
diff --git a/src/Kernel/Mnemonics/_lshr.php b/src/Kernel/Mnemonics/_lshr.php
@@ -11,8 +11,8 @@ final class _lshr implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::shiftRight($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lsub.php b/src/Kernel/Mnemonics/_lsub.php
@@ -11,8 +11,8 @@ final class _lsub implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::sub($value1, $value2, 8));
     }
diff --git a/src/Kernel/Mnemonics/_lushr.php b/src/Kernel/Mnemonics/_lushr.php
@@ -11,8 +11,8 @@ final class _lushr implements OperationInterface
 
     public function execute(): void
     {
-        $value1 = $this->getStack();
         $value2 = $this->getStack();
+        $value1 = $this->getStack();
 
         $this->pushStack(BinaryTool::unsignedShiftRight($value1, $value2, 8));
     }
diff --git a/src/Utilities/BinaryTool.php b/src/Utilities/BinaryTool.php
@@ -135,9 +135,9 @@ final public static function unsignedShiftRight($value1, $value2, $bytes)
     {
         $value1 = (int) $value1;
         $value2 = (int) $value2;
-        $bits = sprintf('%0' . ($bytes * 8) . 's', base_convert($value2, 10, 2));
+        $bits = sprintf('%0' . ($bytes * 8) . 's', base_convert($value1, 10, 2));
 
-        $bits = sprintf('%0' . ($bytes * 8) . 's', substr($bits, 0, strlen($bits) - $value1));
+        $bits = sprintf('%0' . ($bytes * 8) . 's', substr($bits, 0, strlen($bits) - $value2));
 
         if ($bits === '') {
             $bits = '0';
diff --git a/tests/BinaryOperatorTest.php b/tests/BinaryOperatorTest.php
diff --git a/tests/BranchIfTest.php b/tests/BranchIfTest.php
diff --git a/tests/ImitateJavaLangMathTest.php b/tests/ImitateJavaLangMathTest.php
diff --git a/tests/fixtures/java/BinaryOperatorTest.java b/tests/fixtures/java/BinaryOperatorTest.java
diff --git a/tests/fixtures/java/BranchIfTest.java b/tests/fixtures/java/BranchIfTest.java
diff --git a/tests/fixtures/java/ImitateJavaLangMathTest.java b/tests/fixtures/java/ImitateJavaLangMathTest.java

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`use PHPJava\Utilities\ClassResolver;`
`5`	`5`
`6`		`-class JavaClassInlineReaderInterface implements JavaClassReaderInterface`
	`6`	`+class JavaClassInlineReader implements JavaClassReaderInterface`
`7`	`7`	`{`
`8`	`8`	`private $fileName;`
`9`	`9`	`private $handle;`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,16 @@ public static function abs($number)`
`16`	`16`	`{`
`17`	`17`	`return abs($number);`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+ /**`
	`21`	`+ * This decrease 1 from parameters`
	`22`	`+ *`
	`23`	`+ * @see https://docs.oracle.com/javase/jp/8/docs/api/java/lang/Math.html#decrementExact-int-`
	`24`	`+ * @param int $a`
	`25`	`+ * @return int`
	`26`	`+ */`
	`27`	`+ public static function decrementExact($a)`
	`28`	`+ {`
	`29`	`+ return $a - 1;`
	`30`	`+ }`
`19`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _dadd implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $value1 = $this->getStack();`
`15`	`14`	`$value2 = $this->getStack();`
	`15`	`+ $value1 = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::add($value1, $value2));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _dmul implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $value1 = $this->getStack();`
`15`	`14`	`$value2 = $this->getStack();`
	`15`	`+ $value1 = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::multiply($value1, $value2, 8));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _dsub implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $leftValue = $this->getStack();`
`15`	`14`	`$rightValue = $this->getStack();`
	`15`	`+ $leftValue = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::sub($leftValue, $rightValue, 8));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _iadd implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $leftValue = $this->getStack();`
`15`	`14`	`$rightValue = $this->getStack();`
	`15`	`+ $leftValue = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::add($leftValue, $rightValue));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class _iand implements OperationInterface`
`11`	`11`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`		`- $value1 = $this->getStack();`
`15`	`14`	`$value2 = $this->getStack();`
	`15`	`+ $value1 = $this->getStack();`
`16`	`16`
`17`	`17`	`$this->pushStack(BinaryTool::andBits($value1, $value2, 4));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public function execute(): void`
`13`	`13`	`{`
`14`	`14`	`$offset = $this->readShort();`
`15`	`15`
`16`		`- $leftOperand = $this->getStack();`
`17`	`16`	`$rightOperand = $this->getStack();`
	`17`	`+ $leftOperand = $this->getStack();`
`18`	`18`
`19`	`19`	`if ($leftOperand === $rightOperand) {`
`20`	`20`	`$this->setOffset($this->getProgramCounter() + $offset);`