Use Extractor::getRealValue

y-uti · y-uti · commit cf348ed348e6 · 2019-05-11T10:57:03.000+09:00
diff --git a/src/Kernel/Mnemonics/_aastore.php b/src/Kernel/Mnemonics/_aastore.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Utilities\Extractor;
+
 final class _aastore implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
@@ -12,7 +14,7 @@ final class _aastore implements OperationInterface
     public function execute(): void
     {
         $value = $this->popFromOperandStack();
-        $index = $this->popFromOperandStack();
+        $index = Extractor::getRealValue($this->popFromOperandStack());
         $arrayref = $this->popFromOperandStack();
 
         $arrayref[$index] = $value;
diff --git a/src/Kernel/Mnemonics/_anewarray.php b/src/Kernel/Mnemonics/_anewarray.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Utilities\Extractor;
+
 final class _anewarray implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
@@ -17,7 +19,7 @@ public function execute(): void
         $this->readUnsignedShort();
 
         // 空の配列を渡す (nullで埋める)
-        $count = $this->popFromOperandStack();
+        $count = Extractor::getRealValue($this->popFromOperandStack());
         // need reference
         $ref = new \ArrayIterator(array_fill(0, $count, null));
         $this->pushToOperandStackByReference($ref);
diff --git a/src/Kernel/Mnemonics/_daload.php b/src/Kernel/Mnemonics/_daload.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Utilities\Extractor;
+
 final class _daload implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
@@ -11,7 +13,7 @@ final class _daload implements OperationInterface
      */
     public function execute(): void
     {
-        $index = $this->popFromOperandStack();
+        $index = Extractor::getRealValue($this->popFromOperandStack());
         $arrayref = $this->popFromOperandStack();
 
         $this->pushToOperandStack($arrayref[$index]);
diff --git a/src/Kernel/Mnemonics/_dastore.php b/src/Kernel/Mnemonics/_dastore.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Utilities\Extractor;
+
 final class _dastore implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
@@ -12,7 +14,7 @@ final class _dastore implements OperationInterface
     public function execute(): void
     {
         $value = $this->popFromOperandStack();
-        $index = $this->popFromOperandStack();
+        $index = Extractor::getRealValue($this->popFromOperandStack());
         $arrayref = $this->popFromOperandStack();
 
         $arrayref[$index] = $value;
diff --git a/src/Kernel/Mnemonics/_laload.php b/src/Kernel/Mnemonics/_laload.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Utilities\Extractor;
+
 final class _laload implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
@@ -11,7 +13,7 @@ final class _laload implements OperationInterface
      */
     public function execute(): void
     {
-        $index = $this->popFromOperandStack();
+        $index = Extractor::getRealValue($this->popFromOperandStack());
         $arrayref = $this->popFromOperandStack();
 
         $this->pushToOperandStack($arrayref[$index]);
diff --git a/src/Kernel/Mnemonics/_lastore.php b/src/Kernel/Mnemonics/_lastore.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Utilities\Extractor;
+
 final class _lastore implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
@@ -12,7 +14,7 @@ final class _lastore implements OperationInterface
     public function execute(): void
     {
         $value = $this->popFromOperandStack();
-        $index = $this->popFromOperandStack();
+        $index = Extractor::getRealValue($this->popFromOperandStack());
         $arrayref = $this->popFromOperandStack();
 
         $arrayref[$index] = $value;
diff --git a/tests/ArrayTest.php b/tests/ArrayTest.php
@@ -0,0 +1,40 @@
+<?php
+namespace PHPJava\Tests;
+
+class ArrayTest extends Base
+{
+    protected $fixtures = [
+        'ArrayTest',
+    ];
+
+    private function call($method)
+    {
+        $calculatedValue = $this->initiatedJavaClasses['ArrayTest']
+            ->getInvoker()
+            ->getStatic()
+            ->getMethods()
+            ->call($method);
+
+        return $calculatedValue;
+    }
+
+    public function testCreateIntArray()
+    {
+        $actual = $this->call('createIntArray');
+
+        $this->assertEquals(3, $actual->count());
+        $this->assertEquals(1, $actual->offsetGet(0)->getValue());
+        $this->assertEquals(2, $actual->offsetGet(1)->getValue());
+        $this->assertEquals(3, $actual->offsetGet(2)->getValue());
+    }
+
+    public function testCreateStringArray()
+    {
+        $actual = $this->call('createStringArray');
+
+        $this->assertEquals(3, $actual->count());
+        $this->assertEquals("foo", $actual->offsetGet(0));
+        $this->assertEquals("bar", $actual->offsetGet(1));
+        $this->assertEquals("baz", $actual->offsetGet(2));
+    }
+}
diff --git a/tests/fixtures/java/ArrayTest.java b/tests/fixtures/java/ArrayTest.java
@@ -0,0 +1,12 @@
+class ArrayTest
+{
+    public static int[] createIntArray()
+    {
+	return new int[] { 1, 2, 3 };
+    }
+
+    public static String[] createStringArray()
+    {
+	return new String[] { "foo", "bar", "baz" };
+    }
+}
