Support construction

m3m0r7 · m3m0r7 · commit 7fcc288d8d1f · 2019-02-26T23:44:11.000+09:00
diff --git a/src/core/JavaClassInvoker.php b/src/core/JavaClassInvoker.php
@@ -107,9 +107,6 @@ public function __construct(JavaClass $javaClass)
 
     public function construct(): self
     {
-        if (isset($this->staticMethods['<init>'])) {
-            $this->getStaticMethods()->call('<init>');
-        }
 
         // reset dynamic fields
         $this->dynamicFieldAccessor = new JVM\Field\DynamicField(
@@ -122,6 +119,12 @@ public function construct(): self
             $this->dynamicMethods
         );
 
+        if (isset($this->dynamicMethods['<init>'])) {
+            $this->getDynamicMethods()->call(
+                '<init>'
+            );
+        }
+
         return $this;
     }
 
diff --git a/src/core/jvm/field/DynamicField.php b/src/core/jvm/field/DynamicField.php
@@ -9,7 +9,7 @@ class DynamicField implements FieldInterface
     use FieldSettable;
 
     private $javaClassInvoker;
-    private $fields = [];
+    public $fields = [];
 
     public function __construct(JavaClassInvoker $javaClassInvoker, array $fields)
     {
diff --git a/src/core/jvm/field/FieldGettable.php b/src/core/jvm/field/FieldGettable.php
@@ -15,6 +15,7 @@ trait FieldGettable
     public function get(string $name)
     {
         if (!isset($this->fields[$name])) {
+            debug_print_backtrace();
             throw new NoSuchFieldException('Get to undefined field ' . $name);
         }
         if ($this->fields[$name] instanceof _String) {
diff --git a/src/kernel/mnemonics/_invokespecial.php b/src/kernel/mnemonics/_invokespecial.php
@@ -34,6 +34,9 @@ public function execute(): void
             return;
         }
 
+        $this->javaClassInvoker
+            ->addToSpecialInvokedList($methodName, $signature);
+
         if ($invokerClass instanceof JavaClass) {
             $result = $invokerClass->getInvoker()->getDynamicMethods()
                 ->call(
@@ -50,9 +53,6 @@ public function execute(): void
             );
         }
 
-        $this->javaClassInvoker
-            ->addToSpecialInvokedList($methodName, $signature);
-
         if ($parsedSignature[0]['type'] !== 'void') {
             $this->pushStack($result);
         }
diff --git a/src/kernel/mnemonics/_putfield.php b/src/kernel/mnemonics/_putfield.php
@@ -12,15 +12,13 @@ final class _putfield implements OperationInterface
     public function execute(): void
     {
         $cpInfo = $this->getConstantPool()->getEntries();
-        
         $cp = $cpInfo[$this->readUnsignedShort()];
         $class = $cpInfo[$cp->getNameAndTypeIndex()];
-        
+
         $value = $this->getStack();
         $name = $cpInfo[$class->getNameIndex()]->getString();
-        
         $objectref = $this->getStack();
-        
-        $objectref->setInstance($name, $value);
+
+        $objectref->getInvoker()->getDynamicFields()->set($name, $value);
     }
 }
diff --git a/tools/test.php b/tools/test.php
@@ -9,14 +9,6 @@
     new \PHPJava\Core\JavaClassReader(__DIR__ . '/Test.class')
 );
 
-
-var_dump(
-    $javaClass->getInvoker()
-    ->construct()
-    ->getDynamicFields()
-    ->get('z')
-);
-
 $javaClass->getInvoker()->getStaticFields()
     ->set('c', 100)
     ->set('b', 'New String');

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class DynamicField implements FieldInterface`
`9`	`9`	`use FieldSettable;`
`10`	`10`
`11`	`11`	`private $javaClassInvoker;`
`12`		`- private $fields = [];`
	`12`	`+ public $fields = [];`
`13`	`13`
`14`	`14`	`public function __construct(JavaClassInvoker $javaClassInvoker, array $fields)`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ trait FieldGettable`
`15`	`15`	`public function get(string $name)`
`16`	`16`	`{`
`17`	`17`	`if (!isset($this->fields[$name])) {`
	`18`	`+ debug_print_backtrace();`
`18`	`19`	`throw new NoSuchFieldException('Get to undefined field ' . $name);`
`19`	`20`	`}`
`20`	`21`	`if ($this->fields[$name] instanceof _String) {`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ public function execute(): void`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ $this->javaClassInvoker`
	`38`	`+ ->addToSpecialInvokedList($methodName, $signature);`
	`39`	`+`
`37`	`40`	`if ($invokerClass instanceof JavaClass) {`
`38`	`41`	`$result = $invokerClass->getInvoker()->getDynamicMethods()`
`39`	`42`	`->call(`
`@@ -50,9 +53,6 @@ public function execute(): void`
`50`	`53`	`);`
`51`	`54`	`}`
`52`	`55`
`53`		`- $this->javaClassInvoker`
`54`		`- ->addToSpecialInvokedList($methodName, $signature);`
`55`		`-`
`56`	`56`	`if ($parsedSignature[0]['type'] !== 'void') {`
`57`	`57`	`$this->pushStack($result);`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,13 @@ final class _putfield implements OperationInterface`
`12`	`12`	`public function execute(): void`
`13`	`13`	`{`
`14`	`14`	`$cpInfo = $this->getConstantPool()->getEntries();`
`15`		`-`
`16`	`15`	`$cp = $cpInfo[$this->readUnsignedShort()];`
`17`	`16`	`$class = $cpInfo[$cp->getNameAndTypeIndex()];`
`18`		`-`
	`17`	`+`
`19`	`18`	`$value = $this->getStack();`
`20`	`19`	`$name = $cpInfo[$class->getNameIndex()]->getString();`
`21`		`-`
`22`	`20`	`$objectref = $this->getStack();`
`23`		`-`
`24`		`- $objectref->setInstance($name, $value);`
	`21`	`+`
	`22`	`+ $objectref->getInvoker()->getDynamicFields()->set($name, $value);`
`25`	`23`	`}`
`26`	`24`	`}`