WIP: Add a multi dimension array generator

m3m0r7 · m3m0r7 · commit 147101416584 · 2019-05-16T15:00:44.000+09:00
diff --git a/src/Kernel/Mnemonics/_multianewarray.php b/src/Kernel/Mnemonics/_multianewarray.php
@@ -1,6 +1,10 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Kernel\Types\_Array\Collection;
+use PHPJava\Utilities\Extractor;
+use PHPJava\Utilities\Formatter;
+
 final class _multianewarray implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
@@ -12,9 +16,50 @@ public function execute(): void
         $index = $this->readUnsignedShort();
         $dimensions = $this->readByte();
 
-        $descriptor = $cp[$cp[$index]->getClassIndex()]->getString();
+        $descriptor = Formatter::parseSignature(
+            $cp[$cp[$index]->getClassIndex()]->getString()
+        );
+
+        $counts = array_fill(0, $dimensions, 0);
+
+        for ($i = $dimensions - 1; $i >= 0; $i--) {
+            $counts[$i] = Extractor::getRealValue(
+                $this->popFromOperandStack()
+            );
+        }
+
+        $data = null;
+        $multiDimensionArray = $this->makeMultiDimensionArray(
+            $data,
+            $counts,
+            $descriptor[0]['class_name'] ?? $descriptor[0]['type'],
+            0,
+            $dimensions
+        );
 
-        var_dump($descriptor, $dimensions);
-        exit();
+        $this->pushToOperandStackByReference($multiDimensionArray);
+    }
+
+    /**
+     * @param $array
+     * @return $this
+     */
+    private function makeMultiDimensionArray($array, array $counts, string $type, int $currentDimension, int $maxDimension)
+    {
+        if ($currentDimension >= $maxDimension) {
+            return $array;
+        }
+        $newArray = (new Collection())->setType($type);
+        for ($i = 0; $i < $counts[$currentDimension]; $i++) {
+            $collection = (new Collection())->setType($type);
+            $newArray[$i] = $this->makeMultiDimensionArray(
+                $collection,
+                $counts,
+                $type,
+                $currentDimension + 1,
+                $maxDimension
+            );
+        }
+        return $newArray;
     }
 }
diff --git a/src/Kernel/Types/_Array/Collection.php b/src/Kernel/Types/_Array/Collection.php
@@ -9,20 +9,27 @@ class Collection implements \ArrayAccess, \Countable, \IteratorAggregate
 {
     private $data;
     private $position = 0;
+    private $type;
 
-    public function __construct(array &$data, string $type = null)
+    public function __construct(array &$data = [])
     {
         $this->data = $data;
     }
 
+    public function setType(string $type = null)
+    {
+        $this->type = $type;
+        return $this;
+    }
+
     public function getType($default = null): ?string
     {
         if (!isset($this->data[0])) {
-            return $default;
+            return $this->type ?? $default;
         }
         return TypeResolver::resolveFromPHPType(
             Extractor::getRealValue($this->data[0])
-        ) ?? $default;
+        ) ?? $this->type ?? $default;
     }
 
     public function __toString()
@@ -55,6 +62,10 @@ public function offsetUnset($offset)
 
     public function offsetSet($offset, $value)
     {
+        if (empty($offset)) {
+            $this->data[] = $value;
+            return;
+        }
         $this->data[$offset] = $value;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -9,20 +9,27 @@ class Collection implements \ArrayAccess, \Countable, \IteratorAggregate`
`9`	`9`	`{`
`10`	`10`	`private $data;`
`11`	`11`	`private $position = 0;`
	`12`	`+ private $type;`
`12`	`13`
`13`		`- public function __construct(array &$data, string $type = null)`
	`14`	`+ public function __construct(array &$data = [])`
`14`	`15`	`{`
`15`	`16`	`$this->data = $data;`
`16`	`17`	`}`
`17`	`18`
	`19`	`+ public function setType(string $type = null)`
	`20`	`+ {`
	`21`	`+ $this->type = $type;`
	`22`	`+ return $this;`
	`23`	`+ }`
	`24`	`+`
`18`	`25`	`public function getType($default = null): ?string`
`19`	`26`	`{`
`20`	`27`	`if (!isset($this->data[0])) {`
`21`		`- return $default;`
	`28`	`+ return $this->type ?? $default;`
`22`	`29`	`}`
`23`	`30`	`return TypeResolver::resolveFromPHPType(`
`24`	`31`	`Extractor::getRealValue($this->data[0])`
`25`		`- ) ?? $default;`
	`32`	`+ ) ?? $this->type ?? $default;`
`26`	`33`	`}`
`27`	`34`
`28`	`35`	`public function __toString()`
`@@ -55,6 +62,10 @@ public function offsetUnset($offset)`
`55`	`62`
`56`	`63`	`public function offsetSet($offset, $value)`
`57`	`64`	`{`
	`65`	`+ if (empty($offset)) {`
	`66`	`+ $this->data[] = $value;`
	`67`	`+ return;`
	`68`	`+ }`
`58`	`69`	`$this->data[$offset] = $value;`
`59`	`70`	`}`
`60`	`71`