WIP commit

m3m0r7 · m3m0r7 · commit 192347a56920 · 2019-03-01T12:18:17.000+09:00
diff --git a/src/Core/JVM/Invoker/Invokable.php b/src/Core/JVM/Invoker/Invokable.php
@@ -87,15 +87,17 @@ function ($argument) {
                 Formatter::parseSignature($constantPool[$methodReference->getDescriptorIndex()]->getString())['arguments']
             );
 
+            var_dump($methodSignature, $convertedPassedArguments);
+
             if ($methodSignature === $convertedPassedArguments) {
                 $method = $methodReference;
                 break;
             }
         }
 
         if ($method === null) {
-            // var_dump($convertedPassedArguments);
-            // debug_print_backtrace();
+
+            debug_print_backtrace();
             throw new NoSuchMethodException('Call to undefined method ' . $name . '.');
         }
 
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -66,6 +66,8 @@ class JavaClass
 
     private $innerClasses = [];
 
+    private $parentClass;
+
     /**
      * JavaClass constructor.
      * @param JavaClassReader $reader
@@ -179,6 +181,22 @@ public function appendDebug($log)
         return $this;
     }
 
+    public function hasParentClass(): bool
+    {
+        return isset($this->parentClass);
+    }
+
+    public function setParentClass(JavaClass $class): self
+    {
+        $this->parentClass = $class;
+        return $this;
+    }
+
+    public function getParentClass(): JavaClass
+    {
+        return $this->parentClass;
+    }
+
     public function debug(): void
     {
         $cpInfo = $this->getConstantPool()->getEntries();
diff --git a/src/Core/JavaClassInvoker.php b/src/Core/JavaClassInvoker.php
@@ -93,17 +93,18 @@ public function __construct(JavaClass $javaClass)
     }
 
     /**
+     * @param array $arguments
      * @return JavaClassInvoker
      */
-    public function construct(): self
+    public function construct(array $arguments = []): self
     {
         $this->dynamicAccessor = new DynamicAccessor(
             $this,
             $this->dynamicMethods
         );
 
         if (isset($this->dynamicMethods['<init>'])) {
-            $this->getDynamic()->getMethods()->call('<init>');
+            $this->getDynamic()->getMethods()->call('<init>', ...$arguments);
         }
 
         return $this;
diff --git a/src/Kernel/Mnemonics/_new.php b/src/Kernel/Mnemonics/_new.php
@@ -26,21 +26,13 @@ public function execute(): void
             /**
              * @var \PHPJava\Core\JavaClass $classObject
              */
-            $classObject = $classObject
-                ->getInvoker()
-                ->construct()
-                ->getJavaClass();
 
-            $className = explode(
-                '$',
-                $classObject->getClassName()
-            );
-
-            if (count($className) > 1) {
-                $classObject->setParentClass($this->javaClass);
+            $classObjectInvoker = $classObject->getInvoker();
+            $arguments = [];
+            if ($classObject->hasParentClass()) {
+                $arguments[] = $this->javaClass;
             }
-
-            $this->pushStack($classObject);
+            $this->pushStack($classObjectInvoker->construct(...$arguments)->getJavaClass());
             return;
         }
         $this->pushStack(new $classObject());
diff --git a/src/Utilities/ClassResolver.php b/src/Utilities/ClassResolver.php
@@ -34,15 +34,14 @@ public static function resolve($javaPath): array
         foreach (static::$resolves as [$resourceType, $value]) {
             switch ($resourceType) {
                 case static::RESOURCE_TYPE_FILE:
-                    $relativePathByMainClass = explode('$', $relativePath, 2)[0];
-                    $path = realpath($value . '/' . $relativePathByMainClass . '.class');
+                    $path = realpath($value . '/' . $relativePath . '.class');
                     if (($key = array_search($path, static::$resolvedPaths, true)) !== false) {
                         return static::$resolvedPaths[$key];
                     }
                     if (is_file($path)) {
                         return $resolvedPaths[] = [
                             static::RESOLVED_TYPE_CLASS,
-                            new JavaClass(new JavaClassReader($path)),
+                            (new JavaClass(new JavaClassReader($path)))
                         ];
                     }
                     break;

Original file line number	Diff line number	Diff line change
`@@ -87,15 +87,17 @@ function ($argument) {`
`87`	`87`	`Formatter::parseSignature($constantPool[$methodReference->getDescriptorIndex()]->getString())['arguments']`
`88`	`88`	`);`
`89`	`89`
	`90`	`+ var_dump($methodSignature, $convertedPassedArguments);`
	`91`	`+`
`90`	`92`	`if ($methodSignature === $convertedPassedArguments) {`
`91`	`93`	`$method = $methodReference;`
`92`	`94`	`break;`
`93`	`95`	`}`
`94`	`96`	`}`
`95`	`97`
`96`	`98`	`if ($method === null) {`
`97`		`- // var_dump($convertedPassedArguments);`
`98`		`- // debug_print_backtrace();`
	`99`	`+`
	`100`	`+ debug_print_backtrace();`
`99`	`101`	`throw new NoSuchMethodException('Call to undefined method ' . $name . '.');`
`100`	`102`	`}`
`101`	`103`
Original file line number	Diff line number	Diff line change
`@@ -93,17 +93,18 @@ public function __construct(JavaClass $javaClass)`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/**`
	`96`	`+ * @param array $arguments`
`96`	`97`	`* @return JavaClassInvoker`
`97`	`98`	`*/`
`98`		`- public function construct(): self`
	`99`	`+ public function construct(array $arguments = []): self`
`99`	`100`	`{`
`100`	`101`	`$this->dynamicAccessor = new DynamicAccessor(`
`101`	`102`	`$this,`
`102`	`103`	`$this->dynamicMethods`
`103`	`104`	`);`
`104`	`105`
`105`	`106`	`if (isset($this->dynamicMethods['<init>'])) {`
`106`		`- $this->getDynamic()->getMethods()->call('<init>');`
	`107`	`+ $this->getDynamic()->getMethods()->call('<init>', ...$arguments);`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`return $this;`