WIP commit

m3m0r7 · m3m0r7 · commit d2fc9e5cccf6 · 2019-03-02T01:24:14.000+09:00
diff --git a/src/Core/JVM/FlexibleMethod.php b/src/Core/JVM/FlexibleMethod.php
@@ -0,0 +1,12 @@
+<?php
+namespace PHPJava\Core\JVM;
+
+class FlexibleMethod
+{
+    private $method;
+
+    public function __construct(\ReflectionMethod $method)
+    {
+        $this->method = $method;
+    }
+}
diff --git a/src/Core/JVM/Invoker/Invokable.php b/src/Core/JVM/Invoker/Invokable.php
@@ -3,6 +3,7 @@
 
 use PHPJava\Core\JavaClass;
 use PHPJava\Core\JavaClassInvoker;
+use PHPJava\Core\JVM\FlexibleMethod;
 use PHPJava\Core\JVM\Stream\BinaryReader;
 use PHPJava\Exceptions\IllegalJavaClassException;
 use PHPJava\Exceptions\RuntimeException;
@@ -97,6 +98,11 @@ function ($argument) {
         $method = null;
 
         foreach ($methodReferences as $methodReference) {
+            // If flexible method is available then Invoker use it all time.
+            if ($methodReference instanceof FlexibleMethod) {
+                $method = $methodReference;
+                break;
+            }
             $constantPool = ($currentConstantPool = $methodReference->getConstantPool())->getEntries();
             /**
              * @var _MethodInfo $methodReference
@@ -114,6 +120,14 @@ function ($argument) {
             throw new NoSuchMethodException('Call to undefined method ' . $name . '.');
         }
 
+        if ($method instanceof FlexibleMethod) {
+            /**
+             * @var FlexibleMethod $method
+             */
+            // TODO: will implement invocation for flexible method
+            return $method->invoke();
+        }
+
         $codeAttribute = $getCodeAttribute($method->getAttributes());
 
         if ($codeAttribute === null) {
diff --git a/src/Utilities/SuperClassResolver.php b/src/Utilities/SuperClassResolver.php
@@ -3,6 +3,7 @@
 
 use PHPJava\Core\JavaClass;
 use PHPJava\Core\JVM\ConstantPool;
+use PHPJava\Core\JVM\FlexibleMethod;
 use PHPJava\Imitation\java\lang\_Object;
 
 class SuperClassResolver
@@ -25,22 +26,18 @@ public function resolveMethod($methodName, JavaClass $class)
             }
             return $this->resolveMethod($methodName, $class->getSuperClass());
         }
-// TODO: Will implement extends imitation classes
-//        elseif (!($class->getSuperClass() instanceof _Object)) {
-//            $this->classes = array_merge($this->classes, array_map(
-//                function ($method) use ($class) {
-//                    return static::convertToCallable($method, $class->getSuperClass());
-//                },
-//                (new \ReflectionClass($class->getSuperClass()))->getMethods()
-//            ));
-//            return $this->resolveAll($class->getSuperClass());
-//        }
-//        $this->classes = array_merge($this->classes, array_map(
-//            function ($method) use ($class) {
-//                return static::convertToCallable($method, $class->getSuperClass());
-//            },
-//            (new \ReflectionClass($class->getSuperClass()))->getMethods()
-//        ));
-        return $this->classes;
+
+        $prependItems = [];
+        foreach ((new \ReflectionClass($class->getSuperClass()))->getMethods() as $callee) {
+            $resolvedMethodName = $callee->getName();
+            if (!isset($prependItems[$resolvedMethodName])) {
+                $prependItems[$resolvedMethodName] = [];
+            }
+            $prependItems[$resolvedMethodName] = array_merge(
+                $prependItems[$resolvedMethodName],
+                [new FlexibleMethod($callee)]
+            );
+        }
+        return array_merge($prependItems, $this->classes);
     }
 }
diff --git a/src/Utilities/TypeResolver.php b/src/Utilities/TypeResolver.php
@@ -9,6 +9,7 @@ class TypeResolver
     const PHP_TYPE_MAP = [
         'integer' => 'I',
         'string' => 'Ljava.lang.String',
+        'NULL' => '#',
     ];
 
     const SIGNATURE_MAP = [
@@ -22,6 +23,9 @@ class TypeResolver
         'V' => 'void',
         'Z' => 'boolean',
         'L' => 'class',
+
+        // TEMP: various type
+        '#' => 'none',
     ];
 
     /**
