WIP

m3m0r7 · m3m0r7 · commit 5d404e163a1f · 2019-02-25T01:24:59.000+09:00
diff --git a/src/core/JavaClassInvoker.php b/src/core/JavaClassInvoker.php
@@ -39,9 +39,9 @@ public function __construct(JavaClass $javaClass)
             $methodName = $cpInfo[$methodInfo->getNameIndex()]->getString();
 
             if (($methodInfo->getAccessFlag() & AccessFlag::_Static) !== 0) {
-                $this->staticMethods[$methodName] = $methodInfo;
+                $this->staticMethods[$methodName][] = $methodInfo;
             } elseif ($methodInfo->getAccessFlag() === 0 || ($methodInfo->getAccessFlag() & AccessFlag::_Public) !== 0) {
-                $this->dynamicMethods[$methodName] = $methodInfo;
+                $this->dynamicMethods[$methodName][] = $methodInfo;
             }
         }
 
@@ -88,13 +88,16 @@ public function getStaticMethods(): InvokerInterface
     public function getDynamicFields(): FieldInterface
     {
         return new JVM\Field\DynamicField(
-            $this
+            $this,
+            []
         );
     }
 
     public function getStaticFields(): JVM\Field\StaticField
     {
-        return new JVM\Field\StaticField();
+        return new JVM\Field\StaticField(
+            $this
+        );
     }
 
 }
diff --git a/src/core/jvm/field/StaticField.php b/src/core/jvm/field/StaticField.php
@@ -9,6 +9,13 @@ class StaticField
 {
     private static $fields = [];
 
+    private $javaClassInvoker;
+
+    public function __construct(JavaClassInvoker $javaClassInvoker)
+    {
+        $this->javaClassInvoker = $javaClassInvoker;
+    }
+
     /**
      * @param $name
      * @return mixed
diff --git a/src/core/jvm/invoker/Invokable.php b/src/core/jvm/invoker/Invokable.php
@@ -16,6 +16,7 @@
 use PHPJava\Kernel\Maps\OpCode;
 use PHPJava\Kernel\Mnemonics\OperationInterface;
 use PHPJava\Kernel\Structures\_MethodInfo;
+use PHPJava\Utilities\Formatter;
 
 trait Invokable
 {
@@ -50,14 +51,45 @@ public function call(string $name, ...$arguments)
             }
             return null;
         };
+
         /**
          * @var _MethodInfo|null $method
          */
-        $method = $this->methods[$name] ?? null;
-        if ($method === null) {
+        $methods = $this->methods[$name] ?? null;
+        if ($methods === null) {
             throw new UndefinedMethodException('Call to undefined ' . $name . ' method.');
         }
 
+        $constantPool = $this->javaClassInvoker
+            ->getJavaClass()
+            ->getConstantPool()
+            ->getEntries();
+
+        $method = $methods[0];
+
+        // TODO: Refactor find to valid method.
+        // will implement to be compatible to multiple variable arguments size.
+        // And will be applied NoSuchMethodException when cannot find method.
+        if ($name === 'main') {
+            // Find same method
+            foreach ($methods as $method) {
+                $signature = Formatter::parseSignature($constantPool[$method->getDescriptorIndex()]->getString());
+
+                // compare passed arguments
+                foreach ($signature['arguments'] as $signatureArgument) {
+                    foreach ($arguments as $argument) {
+                        var_dump(gettype($argument), $signatureArgument);
+                        if ($argument === $signatureArgument) {
+
+                        }
+                    }
+                }
+                var_dump();
+            }
+
+            exit();
+        }
+
         $codeAttribute = $getCodeAttribute($method->getAttributes());
 
         if ($codeAttribute === null) {
diff --git a/tools/Test.class b/tools/Test.class
diff --git a/tools/test.java b/tools/test.java
@@ -294,6 +294,10 @@ public String testMe (int n, String m, int l, int i, int v, int k) {
 
     }
 
+    public static void main (int[] args) {
+        System.out.println("Called int type main " + args[0]);
+    }
+
     private int testPrivateInteger (int value) {
         return value + 1 * 2 + 3;
     }

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@ public function __construct(JavaClass $javaClass)`
`39`	`39`	`$methodName = $cpInfo[$methodInfo->getNameIndex()]->getString();`
`40`	`40`
`41`	`41`	`if (($methodInfo->getAccessFlag() & AccessFlag::_Static) !== 0) {`
`42`		`- $this->staticMethods[$methodName] = $methodInfo;`
	`42`	`+ $this->staticMethods[$methodName][] = $methodInfo;`
`43`	`43`	`} elseif ($methodInfo->getAccessFlag() === 0 \|\| ($methodInfo->getAccessFlag() & AccessFlag::_Public) !== 0) {`
`44`		`- $this->dynamicMethods[$methodName] = $methodInfo;`
	`44`	`+ $this->dynamicMethods[$methodName][] = $methodInfo;`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`@@ -88,13 +88,16 @@ public function getStaticMethods(): InvokerInterface`
`88`	`88`	`public function getDynamicFields(): FieldInterface`
`89`	`89`	`{`
`90`	`90`	`return new JVM\Field\DynamicField(`
`91`		`- $this`
	`91`	`+ $this,`
	`92`	`+ []`
`92`	`93`	`);`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`public function getStaticFields(): JVM\Field\StaticField`
`96`	`97`	`{`
`97`		`- return new JVM\Field\StaticField();`
	`98`	`+ return new JVM\Field\StaticField(`
	`99`	`+ $this`
	`100`	`+ );`
`98`	`101`	`}`
`99`	`102`
`100`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,10 @@ public String testMe (int n, String m, int l, int i, int v, int k) {`
`294`	`294`
`295`	`295`	`}`
`296`	`296`
	`297`	`+ public static void main (int[] args) {`
	`298`	`+ System.out.println("Called int type main " + args[0]);`
	`299`	`+ }`
	`300`	`+`
`297`	`301`	`private int testPrivateInteger (int value) {`
`298`	`302`	`return value + 1 * 2 + 3;`
`299`	`303`	`}`