Support to inner class

m3m0r7 · m3m0r7 · commit 36189fbef901 · 2019-03-01T12:44:23.000+09:00
diff --git a/src/Core/JVM/Invoker/Invokable.php b/src/Core/JVM/Invoker/Invokable.php
@@ -69,6 +69,13 @@ public function call(string $name, ...$arguments)
             ->getConstantPool()
             ->getEntries();
 
+        if ($name === '<init>' && $this->javaClassInvoker->getJavaClass()->hasParentClass()) {
+            array_unshift(
+                $arguments,
+                $this->javaClassInvoker->getJavaClass()->getParentClass()
+            );
+        }
+
         // Find same method
         $convertedPassedArguments = Formatter::buildArgumentsSignature(
             array_map(
@@ -86,18 +93,13 @@ function ($argument) {
             $methodSignature = Formatter::buildArgumentsSignature(
                 Formatter::parseSignature($constantPool[$methodReference->getDescriptorIndex()]->getString())['arguments']
             );
-
-            var_dump($methodSignature, $convertedPassedArguments);
-
             if ($methodSignature === $convertedPassedArguments) {
                 $method = $methodReference;
                 break;
             }
         }
 
         if ($method === null) {
-
-            debug_print_backtrace();
             throw new NoSuchMethodException('Call to undefined method ' . $name . '.');
         }
 
diff --git a/src/Core/JavaClassInvoker.php b/src/Core/JavaClassInvoker.php
@@ -96,7 +96,7 @@ public function __construct(JavaClass $javaClass)
      * @param array $arguments
      * @return JavaClassInvoker
      */
-    public function construct(array $arguments = []): self
+    public function construct(...$arguments): self
     {
         $this->dynamicAccessor = new DynamicAccessor(
             $this,
diff --git a/src/Kernel/Mnemonics/_invokespecial.php b/src/Kernel/Mnemonics/_invokespecial.php
@@ -30,6 +30,7 @@ public function execute(): void
         krsort($arguments);
 
         $methodName = $cpInfo[$nameAndTypeIndex->getNameIndex()]->getString();
+
         if ($this->javaClassInvoker->isInvoked($methodName, $signature)) {
             return;
         }
@@ -38,7 +39,18 @@ public function execute(): void
             ->addToSpecialInvokedList($methodName, $signature);
 
         if ($invokerClass instanceof JavaClass) {
-            $result = $invokerClass->getInvoker()->getDynamic()->getMethods()
+            if ($invokerClass->getInvoker()->isInvoked($methodName, $signature)) {
+                return;
+            }
+
+            $invokerClass
+                ->getInvoker()
+                ->addToSpecialInvokedList($methodName, $signature);
+
+            $result = $invokerClass
+                ->getInvoker()
+                ->getDynamic()
+                ->getMethods()
                 ->call(
                     $methodName,
                     ...$arguments
diff --git a/src/Kernel/Mnemonics/_new.php b/src/Kernel/Mnemonics/_new.php
@@ -21,18 +21,13 @@ public function execute(): void
             return;
         }
 
-        [$resourceType, $classObject] = ClassResolver::resolve($className);
+        [$resourceType, $classObject] = ClassResolver::resolve($className, $this->javaClass);
         if ($resourceType === ClassResolver::RESOLVED_TYPE_CLASS) {
             /**
              * @var \PHPJava\Core\JavaClass $classObject
              */
 
-            $classObjectInvoker = $classObject->getInvoker();
-            $arguments = [];
-            if ($classObject->hasParentClass()) {
-                $arguments[] = $this->javaClass;
-            }
-            $this->pushStack($classObjectInvoker->construct(...$arguments)->getJavaClass());
+            $this->pushStack($classObject->getInvoker()->construct()->getJavaClass());
             return;
         }
         $this->pushStack(new $classObject());
diff --git a/src/Utilities/ClassResolver.php b/src/Utilities/ClassResolver.php
@@ -21,7 +21,7 @@ class ClassResolver
     private static $resolves = [];
     private static $resolvedPaths = [];
 
-    public static function resolve($javaPath): array
+    public static function resolve(string $javaPath, JavaClass $class = null): array
     {
         $namespaces = explode('.', str_replace('/', '.', $javaPath));
         $buildClassPath = [];
@@ -39,9 +39,13 @@ public static function resolve($javaPath): array
                         return static::$resolvedPaths[$key];
                     }
                     if (is_file($path)) {
+                        $initiatedClass = new JavaClass(new JavaClassReader($path));
+                        if ($class !== null) {
+                            $initiatedClass->setParentClass($class);
+                        }
                         return $resolvedPaths[] = [
                             static::RESOLVED_TYPE_CLASS,
-                            (new JavaClass(new JavaClassReader($path)))
+                            $initiatedClass,
                         ];
                     }
                     break;

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function __construct(JavaClass $javaClass)`
`96`	`96`	`* @param array $arguments`
`97`	`97`	`* @return JavaClassInvoker`
`98`	`98`	`*/`
`99`		`- public function construct(array $arguments = []): self`
	`99`	`+ public function construct(...$arguments): self`
`100`	`100`	`{`
`101`	`101`	`$this->dynamicAccessor = new DynamicAccessor(`
`102`	`102`	`$this,`