Update

m3m0r7 · m3m0r7 · commit 32d51c23a1e1 · 2019-02-24T18:45:35.000+09:00
diff --git a/src/bridge/java/io/PrintStream.php b/src/bridge/java/io/PrintStream.php
@@ -6,7 +6,7 @@
 
 class PrintStream
 {
-
+    private $sequence = '';
     public function println($arg)
     {
         if ($arg instanceof _Utf8) {
@@ -23,4 +23,10 @@ public function println($arg)
         }
     }
 
+    public function append($string)
+    {
+        $this->sequence .= $string;
+        return $this;
+    }
+
 }
diff --git a/src/bridge/java/lang/StringBuilder.php b/src/bridge/java/lang/StringBuilder.php
@@ -5,6 +5,7 @@
 class StringBuilder
 {
     private $sequence = '';
+
     public function append($arg)
     {
         if ($arg instanceof _String) {
@@ -16,18 +17,16 @@ public function append($arg)
             $this->sequence .= $arg;
         }
         return $this;
-
     }
 
-    public function toString($arg = null)
+    public function toString()
     {
         return $this->sequence;
     }
 
     public function __toString()
     {
         return $this->sequence;
-
     }
 
 }
diff --git a/src/kernel/mnemonics/_aaload.php b/src/kernel/mnemonics/_aaload.php
@@ -20,7 +20,6 @@ public function execute(): void
         if (!isset($arrayref[$index])) {
             throw new \PHPJava\Bridge\java\lang\ArrayIndexOutOfBoundsException('Array Index ' . $index . ' out of bounds.');
         }
-        
         $this->pushStack($arrayref[$index]);
     }
 }
diff --git a/src/kernel/mnemonics/_anewarray.php b/src/kernel/mnemonics/_anewarray.php
@@ -22,7 +22,7 @@ public function execute(): void
         // 空の配列を渡す (nullで埋める)
         $count = $this->getStack();
         // need reference
-        $ref = new ArrayIterator(array_fill(0, $count, null));
+        $ref = new \ArrayIterator(array_fill(0, $count, null));
         $this->pushStackByReference($ref);
     }
 }
diff --git a/src/kernel/mnemonics/_invokespecial.php b/src/kernel/mnemonics/_invokespecial.php
@@ -30,7 +30,7 @@ public function execute(): void
         }
 
         $methodName = $cpInfo[$nameAndTypeIndex->getNameIndex()]->getString();
-        var_dump($methodName);
+//        var_dump($methodName);
 
 //        $result = call_user_func_array(
 //            [$this->javaClassInvoker->getDynamicMethods(), $methodName],
diff --git a/src/kernel/mnemonics/_invokevirtual.php b/src/kernel/mnemonics/_invokevirtual.php
@@ -24,7 +24,6 @@ public function execute(): void
         for ($i = 0; $i < $signature['arguments_count']; $i++) {
             $arguments[] = $this->getStack();
         }
-        
         $invokerClass = $this->getStack();
 
         $javaObjectName = str_replace('/', '\\', $class);
@@ -35,10 +34,13 @@ public function execute(): void
         }
 
         $invokerClassName = '\\PHPJava\\Bridge\\' . $javaObjectName;
-        $result = call_user_func_array([
-            new $invokerClassName,
-            $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString()
-        ], $arguments);
+        $result = call_user_func_array(
+            [
+                $invokerClass,
+                $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString()
+            ],
+            $arguments
+        );
 
         if ($signature[0]['type'] !== 'void') {
             $this->pushStack($result);
diff --git a/src/kernel/mnemonics/_newarray.php b/src/kernel/mnemonics/_newarray.php
@@ -15,7 +15,7 @@ public function execute(): void
         $count = $this->getStack();
         
         // need reference
-        $ref = new ArrayIterator(array_fill(0, $count, null));
+        $ref = new \ArrayIterator(array_fill(0, $count, null));
         $this->pushStackByReference($ref);
     }
 }
diff --git a/src/utilities/Formatter.php b/src/utilities/Formatter.php
@@ -71,7 +71,7 @@ public static function parseSignature($signature, $i = 0)
                         $build .= $signature[$i];
                     }
                     $data['arguments'] = ($build !== '') ? static::parseSignature($build) : [];
-                    $data['arguments_count'] = ($data['arguments_count'] ?? 0) + 1;
+                    $data['arguments_count'] = count($data['arguments']);
                     break;
             }
             $i++;
diff --git a/tools/Test.class b/tools/Test.class
diff --git a/tools/test.java b/tools/test.java

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class PrintStream`
`8`	`8`	`{`
`9`		`-`
	`9`	`+ private $sequence = '';`
`10`	`10`	`public function println($arg)`
`11`	`11`	`{`
`12`	`12`	`if ($arg instanceof _Utf8) {`
`@@ -23,4 +23,10 @@ public function println($arg)`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ public function append($string)`
	`27`	`+ {`
	`28`	`+ $this->sequence .= $string;`
	`29`	`+ return $this;`
	`30`	`+ }`
	`31`	`+`
`26`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`class StringBuilder`
`6`	`6`	`{`
`7`	`7`	`private $sequence = '';`
	`8`	`+`
`8`	`9`	`public function append($arg)`
`9`	`10`	`{`
`10`	`11`	`if ($arg instanceof _String) {`
`@@ -16,18 +17,16 @@ public function append($arg)`
`16`	`17`	`$this->sequence .= $arg;`
`17`	`18`	`}`
`18`	`19`	`return $this;`
`19`		`-`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function toString($arg = null)`
	`22`	`+ public function toString()`
`23`	`23`	`{`
`24`	`24`	`return $this->sequence;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public function __toString()`
`28`	`28`	`{`
`29`	`29`	`return $this->sequence;`
`30`		`-`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ public function execute(): void`
`20`	`20`	`if (!isset($arrayref[$index])) {`
`21`	`21`	`throw new \PHPJava\Bridge\java\lang\ArrayIndexOutOfBoundsException('Array Index ' . $index . ' out of bounds.');`
`22`	`22`	`}`
`23`		`-`
`24`	`23`	`$this->pushStack($arrayref[$index]);`
`25`	`24`	`}`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function execute(): void`
`22`	`22`	`// 空の配列を渡す (nullで埋める)`
`23`	`23`	`$count = $this->getStack();`
`24`	`24`	`// need reference`
`25`		`- $ref = new ArrayIterator(array_fill(0, $count, null));`
	`25`	`+ $ref = new \ArrayIterator(array_fill(0, $count, null));`
`26`	`26`	`$this->pushStackByReference($ref);`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function execute(): void`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`$methodName = $cpInfo[$nameAndTypeIndex->getNameIndex()]->getString();`
`33`		`- var_dump($methodName);`
	`33`	`+// var_dump($methodName);`
`34`	`34`
`35`	`35`	`// $result = call_user_func_array(`
`36`	`36`	`// [$this->javaClassInvoker->getDynamicMethods(), $methodName],`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function execute(): void`
`15`	`15`	`$count = $this->getStack();`
`16`	`16`
`17`	`17`	`// need reference`
`18`		`- $ref = new ArrayIterator(array_fill(0, $count, null));`
	`18`	`+ $ref = new \ArrayIterator(array_fill(0, $count, null));`
`19`	`19`	`$this->pushStackByReference($ref);`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public static function parseSignature($signature, $i = 0)`
`71`	`71`	`$build .= $signature[$i];`
`72`	`72`	`}`
`73`	`73`	`$data['arguments'] = ($build !== '') ? static::parseSignature($build) : [];`
`74`		`- $data['arguments_count'] = ($data['arguments_count'] ?? 0) + 1;`
	`74`	`+ $data['arguments_count'] = count($data['arguments']);`
`75`	`75`	`break;`
`76`	`76`	`}`
`77`	`77`	`$i++;`