Succeeded to run invokeinterface

m3m0r7 · m3m0r7 · commit 459fc78c5eb0 · 2019-05-06T12:18:32.000+09:00
diff --git a/src/Kernel/Internal/Lambda.php b/src/Kernel/Internal/Lambda.php
@@ -3,25 +3,38 @@
 namespace PHPJava\Kernel\Internal;
 
 use PHPJava\Core\JavaClass;
+use PHPJava\Utilities\ClassResolver;
 
 class Lambda
 {
     private $javaClass;
     private $name;
     private $descriptor;
     private $class;
+    private $resourceType;
+    private $classObject;
 
     public function __construct(JavaClass $javaClass, string $name, string $descriptor, string $class)
     {
         $this->javaClass = $javaClass;
         $this->name = $name;
         $this->descriptor = $descriptor;
         $this->class = $class;
+
+        [$this->resourceType, $this->classObject] = $javaClass
+            ->getOptions('class_resolver')
+            ->resolve($this->class);
     }
 
     public function __invoke(...$arguments)
     {
-        var_dump($arguments);
-        exit();
+        return $this->javaClass
+            ->getInvoker()
+            ->getStatic()
+            ->getMethods()
+            ->call(
+                $this->name,
+                ...$arguments
+            );
     }
 }
diff --git a/src/Kernel/Mnemonics/_invokeinterface.php b/src/Kernel/Mnemonics/_invokeinterface.php
@@ -31,12 +31,12 @@ public function execute(): void
         }
 
         $objectref = $collection[0];
-        $arguments = array_slice($collection, 1);
+        $arguments = array_values(array_slice($collection, 1));
 
+        $result = $objectref(...$arguments);
 
-        var_dump($objectref(...$arguments));exit();
-        var_dump($name, $descriptor);
-        exit();
-        throw new NotImplementedException(__CLASS__);
+        if ($signature[0] !== 'void') {
+            $this->pushToOperandStack($result);
+        }
     }
 }
diff --git a/src/Kernel/Structures/_String.php b/src/Kernel/Structures/_String.php
@@ -15,6 +15,7 @@ public function execute(): void
     {
         $this->stringIndex = $this->readUnsignedShort();
     }
+
     public function getStringIndex()
     {
         return $this->stringIndex;
diff --git a/src/Packages/java/lang/invoke/StringConcatFactory.php b/src/Packages/java/lang/invoke/StringConcatFactory.php
@@ -1,10 +1,12 @@
 <?php
 namespace PHPJava\Packages\java\lang\invoke;
 
+use PHPJava\Core\JVM\ConstantPool;
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Packages\java\lang\_Object;
 use PHPJava\Packages\java\lang\_String;
 use PHPJava\Packages\java\lang\invoke\MethodHandles\Lookup;
+use PHPJava\Utilities\Formatter;
 
 /**
  * The `StringConcatFactory` class was auto generated.
@@ -32,6 +34,7 @@ public static function makeConcat($a = null, $b = null, $c = null)
     /**
      * Facilitates the creation of optimized String concatenation methods, that can be used to efficiently concatenate a known number of arguments of known types, possibly after type adaptation and partial evaluation of arguments.
      *
+     * @native ConstantPool
      * @param mixed $a
      * @param mixed $b
      * @param mixed $c
@@ -41,7 +44,7 @@ public static function makeConcat($a = null, $b = null, $c = null)
      * @throws StringConcatException
      * @see https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/invoke/package-summary.html#makeConcatWithConstants
      */
-    public static function makeConcatWithConstants($a, $b, $c, $d, ...$e)
+    public static function makeConcatWithConstants(ConstantPool $cp, $a, $b, $c, $d, ...$e)
     {
         /**
          * @var Lookup $lookup
@@ -53,7 +56,10 @@ public static function makeConcatWithConstants($a, $b, $c, $d, ...$e)
         $lookup = $a;
         $name = $b;
         $concatType = $c;
-        $recipe = (string) $d;
+        $recipe = $d;
+        if ($recipe instanceof \PHPJava\Kernel\Structures\_String) {
+            $recipe = $cp[$recipe->getStringIndex()]->getString();
+        }
         $constants = $e;
 
         $newString = '';
@@ -77,7 +83,10 @@ public static function makeConcatWithConstants($a, $b, $c, $d, ...$e)
             $newString .= $char;
         }
 
-        $returnType = $concatType->returnType();
+        [, $returnType] = Formatter::convertJavaNamespaceToPHP(
+            $concatType->returnType()
+        );
+        
         return new $returnType($newString);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@ public function execute(): void`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`$objectref = $collection[0];`
`34`		`- $arguments = array_slice($collection, 1);`
	`34`	`+ $arguments = array_values(array_slice($collection, 1));`
`35`	`35`
	`36`	`+ $result = $objectref(...$arguments);`
`36`	`37`
`37`		`- var_dump($objectref(...$arguments));exit();`
`38`		`- var_dump($name, $descriptor);`
`39`		`- exit();`
`40`		`- throw new NotImplementedException(__CLASS__);`
	`38`	`+ if ($signature[0] !== 'void') {`
	`39`	`+ $this->pushToOperandStack($result);`
	`40`	`+ }`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public function execute(): void`
`15`	`15`	`{`
`16`	`16`	`$this->stringIndex = $this->readUnsignedShort();`
`17`	`17`	`}`
	`18`	`+`
`18`	`19`	`public function getStringIndex()`
`19`	`20`	`{`
`20`	`21`	`return $this->stringIndex;`