Fix #179; enable to reads fields on SuperClass

m3m0r7 · m3m0r7 · commit e67712234ace · 2019-05-27T15:32:53.000+09:00
diff --git a/src/Core/JVM/ClassInvokerInterface.php b/src/Core/JVM/ClassInvokerInterface.php
@@ -27,4 +27,6 @@ public function getDynamic(): AccessorInterface;
     public function getStatic(): AccessorInterface;
 
     public function getProvider(string $providerName): ProviderInterface;
+
+    public function getClassObject();
 }
diff --git a/src/Core/JVM/Field/FieldInterface.php b/src/Core/JVM/Field/FieldInterface.php
@@ -10,4 +10,6 @@ public function __construct(ClassInvokerInterface $javaClassInvoker, array $fiel
     public function get(string $name);
 
     public function set(string $name, $value);
+
+    public function getList(): array;
 }
diff --git a/src/Core/JVM/Field/FieldListable.php b/src/Core/JVM/Field/FieldListable.php
@@ -0,0 +1,10 @@
+<?php
+namespace PHPJava\Core\JVM\Field;
+
+trait FieldListable
+{
+    public function getList(): array
+    {
+        return $this->fields;
+    }
+}
diff --git a/src/Core/JVM/Field/JavaDynamicField.php b/src/Core/JVM/Field/JavaDynamicField.php
@@ -7,6 +7,7 @@ class JavaDynamicField implements FieldInterface
 {
     use FieldGettable;
     use FieldSettable;
+    use FieldListable;
 
     /**
      * @var ClassInvokerInterface
diff --git a/src/Core/JVM/Field/JavaStaticField.php b/src/Core/JVM/Field/JavaStaticField.php
@@ -7,6 +7,7 @@ class JavaStaticField implements FieldInterface
 {
     use FieldGettable;
     use FieldSettable;
+    use FieldListable;
 
     /**
      * @var ClassInvokerInterface
diff --git a/src/Core/JVM/Field/PHPDynamicField.php b/src/Core/JVM/Field/PHPDynamicField.php
@@ -7,6 +7,8 @@
 
 class PHPDynamicField implements FieldInterface
 {
+    use FieldListable;
+
     /**
      * @var ClassInvokerInterface|PHPClassInvoker
      */
diff --git a/src/Core/JVM/Field/PHPStaticField.php b/src/Core/JVM/Field/PHPStaticField.php
@@ -6,6 +6,8 @@
 
 class PHPStaticField implements FieldInterface
 {
+    use FieldListable;
+
     /**
      * @var ClassInvokerInterface
      */
diff --git a/src/Core/JVM/JavaClassInvoker.php b/src/Core/JVM/JavaClassInvoker.php
@@ -44,16 +44,16 @@ class JavaClassInvoker implements ClassInvokerInterface
      */
     private $options = [];
 
-    public function __construct(
-        JavaClassInterface $javaClass,
-        array $options
-    ) {
+    /**
+     * @throws \PHPJava\Exceptions\NormalizerException
+     */
+    public function __construct(JavaClassInterface $javaClass, array $options)
+    {
         $this->javaClass = $javaClass;
         $this->options = $options;
+        $cpInfo = $this->javaClass->getConstantPool();
 
-        $cpInfo = $javaClass->getConstantPool();
-
-        foreach ($javaClass->getDefinedMethods() as $methodInfo) {
+        foreach ($this->javaClass->getDefinedMethods() as $methodInfo) {
             /**
              * @var _MethodInfo $methodInfo
              */
@@ -66,7 +66,7 @@ public function __construct(
             }
         }
 
-        foreach ($javaClass->getDefinedFields() as $fieldInfo) {
+        foreach ($this->javaClass->getDefinedFields() as $fieldInfo) {
             /**
              * @var _FieldInfo $fieldInfo
              */
@@ -84,7 +84,10 @@ public function __construct(
             JavaClassDynamicMethodInvoker::class,
             JavaDynamicField::class,
             $this->dynamicMethods,
-            [],
+            Normalizer::normalizeFields(
+                $this->dynamicFields,
+                $this->javaClass
+            ),
             $this->options
         );
 
@@ -122,4 +125,12 @@ public function construct(...$arguments): ClassInvokerInterface
 
         return $this;
     }
+
+    /**
+     * @return JavaClassInterface
+     */
+    public function getClassObject()
+    {
+        return $this->javaClass;
+    }
 }
diff --git a/src/Core/JVM/Stream/BinaryReader.php b/src/Core/JVM/Stream/BinaryReader.php
@@ -65,8 +65,7 @@ public function readUnsignedShort(): int
 
     public function readInt(): int
     {
-        $bytes = array_values(unpack('c4', $this->read(4)));
-        return ($bytes[0] << 24) | ($bytes[1] << 16) | ($bytes[2] << 8) | $bytes[3];
+        return current(unpack('N', $this->read(4)));
     }
 
     public function readShort(): int
diff --git a/src/Core/JavaCompiledClass.php b/src/Core/JavaCompiledClass.php
@@ -240,12 +240,12 @@ public function __construct(ReaderInterface $reader, array $options = [])
             ]);
         }
 
-        $this->debugTool->getLogger()->info('End of Class');
-
         $this->invoker = new JavaClassInvoker(
             $this,
             $options
         );
+
+        $this->debugTool->getLogger()->info('End of Class');
     }
 
     public function __debugInfo()
@@ -312,16 +312,14 @@ public function getDefinedMethods(): array
 
     public function getDefinedExtendedClasses(): array
     {
-        $beforeClass = null;
-        $currentClass = Formatter::convertPHPNamespacesToJava($this->getClassName());
         $parents = [];
-        var_dump($parents);
-        for (;;) {
-            $parents[] = $currentClass = $this->getSuperClass();
-            var_dump($currentClass);
-            exit();
+        $currentClassObject = $this;
+        while ($parentClass = $currentClassObject->getSuperClass()) {
+            $parents[] = Formatter::convertPHPNamespacesToJava($parentClass->getClassName());
+            $currentClassObject = $parentClass;
         }
-        return [];
+        $parents[] = Formatter::convertPHPNamespacesToJava($this->getClassName());
+        return $parents;
     }
 
     public function getDefinedInterfaceClasses(): array
diff --git a/src/Kernel/Core/Accumulator.php b/src/Kernel/Core/Accumulator.php
@@ -164,17 +164,6 @@ public function getCurrentStackIndex(): int
         return count($this->stacks) - 1;
     }
 
-    public function replaceReferredObject($searchObject, $newObject): void
-    {
-        $replacedIndexes = [];
-        while (($index = array_search($searchObject, $this->stacks)) !== false &&
-            !in_array($index, $replacedIndexes, true)
-        ) {
-            $this->stacks[$index] = $newObject;
-            $replacedIndexes[] = $index;
-        }
-    }
-
     public function popStack(): self
     {
         array_pop($this->stacks);
diff --git a/src/Kernel/Core/ExceptionTableInspectable.php b/src/Kernel/Core/ExceptionTableInspectable.php
@@ -18,7 +18,7 @@ trait ExceptionTableInspectable
      * @throws \PHPJava\Exceptions\UnableToFindAttributionException
      * @return bool succeeded or failed
      */
-    public function inspectExceptionTable(JavaClass $e): bool
+    public function inspectExceptionTable(\Exception $e): bool
     {
         /**
          * @var CodeAttribute $codeAttribute
@@ -29,7 +29,7 @@ public function inspectExceptionTable(JavaClass $e): bool
         );
 
         $expectedClass = Formatter::convertPHPNamespacesToJava(
-            $e->getClassName()
+            get_class($e)
         );
 
         $cpInfo = $this->getConstantPool();
@@ -51,21 +51,23 @@ public function inspectExceptionTable(JavaClass $e): bool
             }
             $catchClass = Formatter::convertPHPNamespacesToJava($cpInfo[$cpInfo[$exception->getCatchType()]->getClassIndex()]->getString());
             if ($catchClass === $expectedClass) {
-                $this->pushToOperandStack($e);
+                $instance = JavaClass::load($catchClass)
+                    ->getInvoker()
+                    ->construct(
+                        $e->getMessage(),
+                        $e->getCode(),
+                        $e
+                    );
+                $this->pushToOperandStack($instance);
                 $this->setOffset($exception->getHandlerPc());
                 return true;
             }
         }
 
-        /**
-         * @var \Exception $exceptionObject
-         */
-        $exceptionObject = $e->getInvoker()->getClassObject();
-
         throw new UncaughtException(
-            $expectedClass . ': ' . $exceptionObject->getMessage(),
+            $expectedClass . ': ' . $e->getMessage(),
             0,
-            $exceptionObject
+            $e
         );
     }
 }
diff --git a/src/Kernel/Mnemonics/_athrow.php b/src/Kernel/Mnemonics/_athrow.php
@@ -23,9 +23,7 @@ public function execute(): void
         $objectref = $this->popFromOperandStack();
 
         try {
-            $this->inspectExceptionTable(
-                $objectref
-            );
+            $this->inspectExceptionTable($objectref->getInvoker()->getClassObject());
         } catch (\Exception $e) {
             throw new UncaughtException(
                 "Unable to catch {$objectref->getClassName()} exception. " .
diff --git a/src/Kernel/Mnemonics/_invokeinterface.php b/src/Kernel/Mnemonics/_invokeinterface.php
@@ -1,6 +1,7 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Core\JavaClassInterface;
 use PHPJava\Kernel\Filters\Normalizer;
 use PHPJava\Kernel\Internal\Lambda;
 use PHPJava\Utilities\Formatter;
@@ -31,6 +32,9 @@ public function execute(): void
             $arguments[$i] = $this->popFromOperandStack();
         }
 
+        /**
+         * @var JavaClassInterface|Lambda $objectref
+         */
         $objectref = $this->popFromOperandStack();
 
         if ($objectref instanceof Lambda) {
diff --git a/src/Kernel/Mnemonics/_invokespecial.php b/src/Kernel/Mnemonics/_invokespecial.php
@@ -37,7 +37,7 @@ public function execute(): void
         try {
             $methodName = $cpInfo[$nameAndTypeIndex->getNameIndex()]->getString();
 
-            if ($objectref->getClassName() !== $className) {
+            if ($className !== $objectref->getClassName()) {
                 $newObject = JavaClass::load(
                     $className,
                     $this->javaClass->getOptions()
@@ -52,21 +52,46 @@ public function execute(): void
                 ...$arguments
             );
 
+            // Call special method (e.g., <init>, <clinit> and soon)
             if (MethodNameResolver::isSpecialMethod($methodName)) {
-                $result = $newObject;
-            }
+                $result = $objectref;
+
+                // Set initialized parent parameters
 
-            // NOTE: PHP has a problem which a reference object cannot replace to an object.
-            if ($parsedSignature[0]['type'] === 'void') {
-                $this->replaceReferredObject($objectref, $newObject);
+                // Static field is written below.
+                $existFieldList = array_keys($objectref->getInvoker()->getStatic()->getFields()->getList());
+                foreach ($newObject->getInvoker()->getStatic()->getFields()->getList() as $fieldName => $value) {
+                    if (in_array($fieldName, $existFieldList, true)) {
+                        continue;
+                    }
+                    $objectref
+                        ->getInvoker()
+                        ->getStatic()
+                        ->getFields()
+                        ->set(
+                            $fieldName,
+                            $value
+                        );
+                }
+
+                // Dynamic field is written below.
+                $existFieldList = array_keys($objectref->getInvoker()->getDynamic()->getFields()->getList());
+                foreach ($newObject->getInvoker()->getDynamic()->getFields()->getList() as $fieldName => $value) {
+                    if (in_array($fieldName, $existFieldList, true)) {
+                        continue;
+                    }
+                    $objectref
+                        ->getInvoker()
+                        ->getDynamic()
+                        ->getFields()
+                        ->set(
+                            $fieldName,
+                            $value
+                        );
+                }
             }
         } catch (\Exception $e) {
-            $this->inspectExceptionTable(
-                JavaClass::load(Formatter::convertPHPNamespacesToJava(get_class($e)), $this->javaClass->getOptions())
-                    ->getInvoker()
-                    ->construct($e->getMessage(), 0, $e)
-                    ->getJavaClass()
-            );
+            $this->inspectExceptionTable($e);
             return;
         }
 
diff --git a/src/Kernel/Mnemonics/_invokestatic.php b/src/Kernel/Mnemonics/_invokestatic.php
@@ -55,12 +55,7 @@ public function execute(): void
                     ...$arguments
                 );
         } catch (\Exception $e) {
-            $this->inspectExceptionTable(
-                JavaClass::load(Formatter::convertPHPNamespacesToJava(get_class($e)), $this->javaClass->getOptions())
-                    ->getInvoker()
-                    ->construct($e->getMessage(), 0, $e)
-                    ->getJavaClass()
-            );
+            $this->inspectExceptionTable($e);
             return;
         }
 
diff --git a/src/Kernel/Mnemonics/_invokevirtual.php b/src/Kernel/Mnemonics/_invokevirtual.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Core\JavaClass;
 use PHPJava\Kernel\Filters\Normalizer;
 use PHPJava\Packages\java\lang\NullPointerException;
 use PHPJava\Utilities\Formatter;
@@ -69,12 +68,7 @@ public function execute(): void
                     ...$arguments
                 );
         } catch (\Exception $e) {
-            $this->inspectExceptionTable(
-                JavaClass::load(Formatter::convertPHPNamespacesToJava(get_class($e)), $this->javaClass->getOptions())
-                    ->getInvoker()
-                    ->construct($e->getMessage(), 0, $e)
-                    ->getJavaClass()
-            );
+            $this->inspectExceptionTable($e);
             return;
         }
 
diff --git a/src/Kernel/Mnemonics/_putfield.php b/src/Kernel/Mnemonics/_putfield.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
+use PHPJava\Core\JavaClassInterface;
+
 final class _putfield implements OperationInterface
 {
     use \PHPJava\Kernel\Core\Accumulator;
@@ -14,8 +16,11 @@ public function execute(): void
 
         $value = $this->popFromOperandStack();
         $name = $cpInfo[$class->getNameIndex()]->getString();
-        $objectref = $this->popFromOperandStack();
 
+        /**
+         * @var JavaClassInterface $objectref
+         */
+        $objectref = $this->popFromOperandStack();
         $objectref->getInvoker()->getDynamic()->getFields()->set($name, $value);
     }
 }
diff --git a/tests/ExtendingClassTest.php b/tests/ExtendingClassTest.php
diff --git a/tests/fixtures/java/ExtendingClassTest1.java b/tests/fixtures/java/ExtendingClassTest1.java
diff --git a/tests/fixtures/java/ExtendingClassTest2.java b/tests/fixtures/java/ExtendingClassTest2.java
diff --git a/tests/fixtures/java/SuperExtendingClassTest.java b/tests/fixtures/java/SuperExtendingClassTest.java

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,6 @@ public function getDynamic(): AccessorInterface;`
`27`	`27`	`public function getStatic(): AccessorInterface;`
`28`	`28`
`29`	`29`	`public function getProvider(string $providerName): ProviderInterface;`
	`30`	`+`
	`31`	`+ public function getClassObject();`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,6 @@ public function __construct(ClassInvokerInterface $javaClassInvoker, array $fiel`
`10`	`10`	`public function get(string $name);`
`11`	`11`
`12`	`12`	`public function set(string $name, $value);`
	`13`	`+`
	`14`	`+ public function getList(): array;`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ class JavaDynamicField implements FieldInterface`
`7`	`7`	`{`
`8`	`8`	`use FieldGettable;`
`9`	`9`	`use FieldSettable;`
	`10`	`+ use FieldListable;`
`10`	`11`
`11`	`12`	`/**`
`12`	`13`	`* @var ClassInvokerInterface`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ class JavaStaticField implements FieldInterface`
`7`	`7`	`{`
`8`	`8`	`use FieldGettable;`
`9`	`9`	`use FieldSettable;`
	`10`	`+ use FieldListable;`
`10`	`11`
`11`	`12`	`/**`
`12`	`13`	`* @var ClassInvokerInterface`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`
`8`	`8`	`class PHPDynamicField implements FieldInterface`
`9`	`9`	`{`
	`10`	`+ use FieldListable;`
	`11`	`+`
`10`	`12`	`/**`
`11`	`13`	`* @var ClassInvokerInterface\|PHPClassInvoker`
`12`	`14`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`class PHPStaticField implements FieldInterface`
`8`	`8`	`{`
	`9`	`+ use FieldListable;`
	`10`	`+`
`9`	`11`	`/**`
`10`	`12`	`* @var ClassInvokerInterface`
`11`	`13`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@ public function readUnsignedShort(): int`
`65`	`65`
`66`	`66`	`public function readInt(): int`
`67`	`67`	`{`
`68`		`- $bytes = array_values(unpack('c4', $this->read(4)));`
`69`		`- return ($bytes[0] << 24) \| ($bytes[1] << 16) \| ($bytes[2] << 8) \| $bytes[3];`
	`68`	`+ return current(unpack('N', $this->read(4)));`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`public function readShort(): int`