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

m3m0r7 · m3m0r7 · commit ff2a987dbc5f · 2019-05-12T21:46:02.000+09:00
diff --git a/src/Kernel/Mnemonics/_instanceof.php b/src/Kernel/Mnemonics/_instanceof.php
@@ -1,7 +1,8 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Int;
+use PHPJava\Utilities\Formatter;
 
 final class _instanceof implements OperationInterface
 {
@@ -10,6 +11,22 @@ final class _instanceof implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $cp = $this->getConstantPool();
+        $objectref = $this->popFromOperandStack();
+
+        $targetClass = $cp[$cp[$this->readUnsignedShort()]->getClassIndex()];
+
+        [, $className] = Formatter::convertJavaNamespaceToPHP($targetClass);
+
+        if ($objectref instanceof $className) {
+            $this->pushToOperandStack(
+                _Int::get(1)
+            );
+            return;
+        }
+
+        $this->pushToOperandStack(
+            _Int::get(0)
+        );
     }
 }
diff --git a/src/Utilities/Formatter.php b/src/Utilities/Formatter.php
@@ -8,8 +8,8 @@
 
 class Formatter
 {
-    const BUILT_IN_PACKAGE = 0;
-    const USER_DEFINED_PACKAGE = 1;
+    const BUILT_IN_PACKAGE = 'BUILT_IN_PACKAGE';
+    const USER_DEFINED_PACKAGE = 'USER_DEFINED_PACKAGE';
 
     /**
      * @param $signature
diff --git a/tests/InstanceOfTest.php b/tests/InstanceOfTest.php
@@ -0,0 +1,40 @@
+<?php
+namespace PHPJava\Tests;
+
+class InstanceOfTest extends Base
+{
+    protected $fixtures = [
+        'InstanceOfTest',
+    ];
+
+    private function call($method)
+    {
+        return $this->initiatedJavaClasses['InstanceOfTest']
+            ->getInvoker()
+            ->getStatic()
+            ->getMethods()
+            ->call($method);
+    }
+
+    public function testInstanceOfString()
+    {
+        ob_start();
+        $this->call('instanceOfString');
+        $result = ob_get_clean();
+        $this->assertEquals(
+            "Hello World\n",
+            $result
+        );
+    }
+
+    public function testInstanceOfObject()
+    {
+        ob_start();
+        $this->call('instanceOfObject');
+        $result = ob_get_clean();
+        $this->assertEquals(
+            "Hello World\n",
+            $result
+        );
+    }
+}
diff --git a/tests/fixtures/java/InstanceOfTest.java b/tests/fixtures/java/InstanceOfTest.java
@@ -0,0 +1,22 @@
+class InstanceOfTest
+{
+    public static void instanceOfString()
+    {
+        String a = "Hello World";
+        if (a instanceof String) {
+            System.out.println(a);
+            return;
+        }
+        System.out.println("Unreachable here.");
+    }
+
+    public static void instanceOfObject()
+    {
+        String a = "Hello World";
+        if (a instanceof Object) {
+            System.out.println(a);
+            return;
+        }
+        System.out.println("Unreachable here.");
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`
`9`	`9`	`class Formatter`
`10`	`10`	`{`
`11`		`- const BUILT_IN_PACKAGE = 0;`
`12`		`- const USER_DEFINED_PACKAGE = 1;`
	`11`	`+ const BUILT_IN_PACKAGE = 'BUILT_IN_PACKAGE';`
	`12`	`+ const USER_DEFINED_PACKAGE = 'USER_DEFINED_PACKAGE';`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @param $signature`