Implemented outer class by using ClassResolver (static only)

m3m0r7 · m3m0r7 · commit d8dca7e4c114 · 2019-02-28T01:09:29.000+09:00
diff --git a/src/Kernel/Mnemonics/_getstatic.php b/src/Kernel/Mnemonics/_getstatic.php
@@ -32,8 +32,15 @@ public function execute(): void
         }
 
         if (isset($signature[0]['class_name'])) {
-            $className = ClassResolver::resolve($signature[0]['class_name']);
-            $this->pushStack(new $className());
+            [$resourceType, $classObject] = ClassResolver::resolve($signature[0]['class_name']);
+            if ($resourceType === ClassResolver::RESOLVED_TYPE_CLASS) {
+                /**
+                 * @var \PHPJava\Core\JavaClass $className
+                 */
+                $this->pushStack($classObject);
+                return;
+            }
+            $this->pushStack(new $classObject());
             return;
         }
     }
diff --git a/src/Kernel/Mnemonics/_invokestatic.php b/src/Kernel/Mnemonics/_invokestatic.php
@@ -18,25 +18,35 @@ public function execute(): void
         $methodName = $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString();
         $signature = Formatter::parseSignature($cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getDescriptorIndex()]->getString());
         $arguments = [];
-        $className = ClassResolver::resolve($cpInfo[$cpInfo[$cp->getClassIndex()]->getClassIndex()]->getString());
+        [$resourceType, $classObject] = ClassResolver::resolve($cpInfo[$cpInfo[$cp->getClassIndex()]->getClassIndex()]->getString());
         for ($i = 0; $i < $signature['arguments_count']; $i++) {
             $arguments[] = $this->getStack();
         }
         
         krsort($arguments);
 
-        if (!class_exists($className)) {
-            throw new \PHPJava\Imitation\java\lang\ClassNotFoundException(str_replace('\\PHPJava\\Imitation\\', '', $className) . ' class does not exist.');
+        $return = null;
+        if ($resourceType === ClassResolver::RESOLVED_TYPE_CLASS) {
+            /**
+             * @var \PHPJava\Core\JavaClass $classObject
+             */
+            $return = $classObject
+                ->getInvoker()
+                ->getStatic()
+                ->getMethods()
+                ->call(
+                    $methodName,
+                    ...$arguments
+                );
+        } elseif ($resourceType === ClassResolver::RESOLVED_TYPE_IMITATION && class_exists($classObject)) {
+            $return = forward_static_call_array(
+                [
+                    $classObject,
+                    $methodName
+                ],
+                $arguments
+            );
         }
-
-        // call Invoker
-        $return = forward_static_call_array(
-            [
-                $className,
-                $methodName
-            ],
-            $arguments
-        );
         
         if ($signature[0]['type'] !== 'void') {
             $this->pushStack($return);
diff --git a/src/Utilities/ClassResolver.php b/src/Utilities/ClassResolver.php
@@ -48,9 +48,15 @@ public static function resolve($javaPath): array
             }
         }
 
+        $className = '\\PHPJava\\Imitation\\' . implode('\\', $buildClassPath);
+
+        if (!class_exists($className)) {
+            throw new \PHPJava\Imitation\java\lang\ClassNotFoundException(str_replace(['\\PHPJava\\Imitation\\', '\\'], ['', '.'], $className) . ' class does not exist.');
+        }
+
         return [
             static::RESOLVED_TYPE_IMITATION,
-            '\\PHPJava\\Imitation\\' . implode('\\', $buildClassPath),
+            $className,
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,15 @@ public function execute(): void`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if (isset($signature[0]['class_name'])) {`
`35`		`- $className = ClassResolver::resolve($signature[0]['class_name']);`
`36`		`- $this->pushStack(new $className());`
	`35`	`+ [$resourceType, $classObject] = ClassResolver::resolve($signature[0]['class_name']);`
	`36`	`+ if ($resourceType === ClassResolver::RESOLVED_TYPE_CLASS) {`
	`37`	`+ /**`
	`38`	`+ * @var \PHPJava\Core\JavaClass $className`
	`39`	`+ */`
	`40`	`+ $this->pushStack($classObject);`
	`41`	`+ return;`
	`42`	`+ }`
	`43`	`+ $this->pushStack(new $classObject());`
`37`	`44`	`return;`
`38`	`45`	`}`
`39`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,15 @@ public static function resolve($javaPath): array`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ $className = '\\PHPJava\\Imitation\\' . implode('\\', $buildClassPath);`
	`52`	`+`
	`53`	`+ if (!class_exists($className)) {`
	`54`	`+ throw new \PHPJava\Imitation\java\lang\ClassNotFoundException(str_replace(['\\PHPJava\\Imitation\\', '\\'], ['', '.'], $className) . ' class does not exist.');`
	`55`	`+ }`
	`56`	`+`
`51`	`57`	`return [`
`52`	`58`	`static::RESOLVED_TYPE_IMITATION,`
`53`		`- '\\PHPJava\\Imitation\\' . implode('\\', $buildClassPath),`
	`59`	`+ $className,`
`54`	`60`	`];`
`55`	`61`	`}`
`56`	`62`