Fix getfield

y-uti · y-uti · commit c2f264fe34ef · 2019-04-30T16:54:13.000+09:00
diff --git a/src/Kernel/Mnemonics/_getfield.php b/src/Kernel/Mnemonics/_getfield.php
@@ -12,17 +12,19 @@ final class _getfield implements OperationInterface
     public function execute(): void
     {
         $cpInfo = $this->getConstantPool();
-
         $cp = $cpInfo[$this->readUnsignedShort()];
+        $class = $cpInfo[$cp->getNameAndTypeIndex()];
 
-        $get = $this->popFromOperandStack();
+        $name = $cpInfo[$class->getNameIndex()]->getString();
+        $objectref = $this->popFromOperandStack();
 
-        $return = $get->getInstance($cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString());
+        $return = $objectref->getInvoker()->getDynamic()->getFields()->get($name);
 
         if ($return !== null) {
             $this->pushToOperandStack($return);
             return;
         }
-        throw new Exception('Cannot get to undefined Field ' . $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString() . '');
+
+        throw new Exception('Cannot get to undefined Field ' . $name);
     }
 }
diff --git a/tests/GetFieldTest.php b/tests/GetFieldTest.php
@@ -0,0 +1,23 @@
+<?php
+namespace PHPJava\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+class GetFieldTest extends Base
+{
+    protected $fixtures = [
+        'GetFieldTest',
+    ];
+
+    public function testGetField()
+    {
+        $actual = $this->initiatedJavaClasses['GetFieldTest']
+            ->getInvoker()
+            ->getStatic()
+            ->getMethods()
+            ->call('getField')
+            ->getValue();
+
+        $this->assertEquals(1, $actual);
+    }
+}
diff --git a/tests/fixtures/java/GetFieldTest.java b/tests/fixtures/java/GetFieldTest.java
@@ -0,0 +1,9 @@
+class GetFieldTest
+{
+    public int value = 1;
+
+    public static int getField() {
+	GetFieldTest instance = new GetFieldTest();
+	return instance.value;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -12,17 +12,19 @@ final class _getfield implements OperationInterface`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`	`14`	`$cpInfo = $this->getConstantPool();`
`15`		`-`
`16`	`15`	`$cp = $cpInfo[$this->readUnsignedShort()];`
	`16`	`+ $class = $cpInfo[$cp->getNameAndTypeIndex()];`
`17`	`17`
`18`		`- $get = $this->popFromOperandStack();`
	`18`	`+ $name = $cpInfo[$class->getNameIndex()]->getString();`
	`19`	`+ $objectref = $this->popFromOperandStack();`
`19`	`20`
`20`		`- $return = $get->getInstance($cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString());`
	`21`	`+ $return = $objectref->getInvoker()->getDynamic()->getFields()->get($name);`
`21`	`22`
`22`	`23`	`if ($return !== null) {`
`23`	`24`	`$this->pushToOperandStack($return);`
`24`	`25`	`return;`
`25`	`26`	`}`
`26`		`- throw new Exception('Cannot get to undefined Field ' . $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString() . '');`
	`27`	`+`
	`28`	`+ throw new Exception('Cannot get to undefined Field ' . $name);`
`27`	`29`	`}`
`28`	`30`	`}`