WIP commit

m3m0r7 · m3m0r7 · commit 1660b9610165 · 2019-02-24T00:57:37.000+09:00
diff --git a/src/bridge/java/lang/StringBuilder.php b/src/bridge/java/lang/StringBuilder.php
@@ -10,6 +10,9 @@ public function append($arg)
         if ($arg instanceof _String) {
             $this->sequence .= $arg->toString();
         } else {
+            if (is_array($arg)) {
+                $arg = implode($arg);
+            }
             $this->sequence .= $arg;
         }
         return $this;
diff --git a/src/core/JavaClassInvoker.php b/src/core/JavaClassInvoker.php
@@ -1,7 +1,7 @@
 <?php
 namespace PHPJava\Core;
 
-use PHPJava\Core\JVM\Field\GetFieldInterface;
+use PHPJava\Core\JVM\Field\FieldInterface;
 use PHPJava\Core\JVM\Invoker\Invokable;
 use PHPJava\Core\JVM\Invoker\InvokerInterface;
 use PHPJava\Kernel\Maps\AccessFlag;
@@ -55,6 +55,9 @@ public function __construct(JavaClass $javaClass)
                 $this->staticFields[$fieldName] = $fieldInfo;
             }
         }
+
+        // call <clinit>
+        $this->getStaticMethods()->{'<clinit>'}();
     }
 
     public function getJavaClass(): JavaClass
@@ -69,16 +72,16 @@ public function getDynamicMethods(): InvokerInterface
 
     public function getStaticMethods(): InvokerInterface
     {
-        return new JVM\Invoker\StaticMethodInvoker($this, $this->dynamicMethods);
+        return new JVM\Invoker\StaticMethodInvoker($this, $this->staticMethods);
     }
 
-    public function getDynamicFields(): GetFieldInterface
+    public function getDynamicFields(): FieldInterface
     {
-        return new JVM\Field\DynamicFieldGetter($this, $this->dynamicFields);
+        return new JVM\Field\DynamicField($this, $this->dynamicFields);
     }
 
-    public function getStaticFields(): GetFieldInterface
+    public function getStaticFields(): JVM\Field\StaticField
     {
-        return new JVM\Field\StaticFieldGetter($this, $this->staticFields);
+        return new JVM\Field\StaticField();
     }
 }
diff --git a/src/core/jvm/field/DynamicField.php b/src/core/jvm/field/DynamicField.php
@@ -0,0 +1,19 @@
+<?php
+namespace PHPJava\Core\JVM\Field;
+
+use PHPJava\Core\JavaClassInvoker;
+
+class DynamicField implements FieldInterface
+{
+    use FieldGettable;
+    use FieldSettable;
+
+    private $javaClassInvoker;
+    private $fields = [];
+
+    public function __construct(JavaClassInvoker $javaClassInvoker, array $fields)
+    {
+        $this->javaClassInvoker = $javaClassInvoker;
+        $this->fields = $fields;
+    }
+}
diff --git a/src/core/jvm/field/DynamicFieldGetter.php b/src/core/jvm/field/DynamicFieldGetter.php
diff --git a/src/core/jvm/field/FieldGettable.php b/src/core/jvm/field/FieldGettable.php
@@ -5,15 +5,6 @@
 
 trait FieldGettable
 {
-    private $javaClassInvoker;
-    private $fields = [];
-
-    public function __construct(JavaClassInvoker $javaClassInvoker, array $fields)
-    {
-        $this->javaClassInvoker = $javaClassInvoker;
-        $this->fields = $fields;
-    }
-
     public function __get($name)
     {
         return $this->fields[$name];
diff --git a/src/core/jvm/field/FieldInterface.php b/src/core/jvm/field/FieldInterface.php
@@ -3,7 +3,7 @@
 
 use PHPJava\Core\JavaClassInvoker;
 
-interface GetFieldInterface
+interface FieldInterface
 {
     public function __construct(JavaClassInvoker $javaClassInvoker, array $fields);
     public function __get($name);
diff --git a/src/core/jvm/field/FieldSettable.php b/src/core/jvm/field/FieldSettable.php
@@ -0,0 +1,12 @@
+<?php
+namespace PHPJava\Core\JVM\Field;
+
+use PHPJava\Core\JavaClassInvoker;
+
+trait FieldSettable
+{
+    public function __set($name, $value)
+    {
+        $this->fields[$name] = $value;
+    }
+}
diff --git a/src/core/jvm/field/StaticField.php b/src/core/jvm/field/StaticField.php
@@ -0,0 +1,18 @@
+<?php
+namespace PHPJava\Core\JVM\Field;
+
+use PHPJava\Core\JavaClassInvoker;
+
+class StaticField
+{
+    private static $fields = [];
+
+    public function __get($name)
+    {
+        return static::$fields[$name];
+    }
+    public function __set($name, $value)
+    {
+        static::$fields[$name] = $value;
+    }
+}
diff --git a/src/core/jvm/field/StaticFieldGetter.php b/src/core/jvm/field/StaticFieldGetter.php
diff --git a/src/core/jvm/invoker/Invokable.php b/src/core/jvm/invoker/Invokable.php
@@ -83,8 +83,7 @@ public function __call($name, $arguments)
             }
         }
 
-        var_dump($codeAttribute);
-        exit();
+        return null;
     }
 
     private function getCodeAttribute(array $attributes): ?CodeAttribute
diff --git a/src/exceptions/FormatterException.php b/src/exceptions/FormatterException.php
@@ -0,0 +1,6 @@
+<?php
+namespace PHPJava\Exceptions;
+
+class FormatterException extends \Exception
+{
+}
diff --git a/src/kernel/attributes/CodeAttribute.php b/src/kernel/attributes/CodeAttribute.php
@@ -67,6 +67,6 @@ public function getOpCodes()
     }
     public function getOpCodeLength()
     {
-        return $this->codeLength;
+        return (int) $this->codeLength;
     }
 }
diff --git a/src/kernel/opcode/_invokevirtual.php b/src/kernel/opcode/_invokevirtual.php
@@ -35,10 +35,9 @@ public function execute(): void
         }
 
         $invokerClassName = '\\PHPJava\\Bridge\\' . $javaObjectName;
-        var_dump($invokerClassName);
 
         $result = call_user_func_array([
-            NEW $invokerClassName,
+            new $invokerClassName,
             $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString()
 
         ], $arguments);
diff --git a/src/kernel/opcode/_putstatic.php b/src/kernel/opcode/_putstatic.php
@@ -16,11 +16,8 @@ public function execute(): void
         $cp = $cpInfo[$this->readUnsignedShort()];
         
         $class = $cpInfo[$cp->getNameAndTypeIndex()];
-        $name = $cpInfo[$class->getNameIndex()]->getString();
-        
-        $value = $this->getStack();
-        
-        // set field
-        $this->getInvoker()->getClass()->setStatic($name, $value);
+        $fieldName = $cpInfo[$class->getNameIndex()]->getString();
+
+        ($this->javaClassInvoker->getStaticFields())->$fieldName = $this->getStack();
     }
 }
diff --git a/src/kernel/opcode/_return.php b/src/kernel/opcode/_return.php
@@ -11,6 +11,5 @@ final class _return implements OpCodeInterface
 
     public function execute(): void
     {
-        return null;
     }
 }
diff --git a/src/utilities/Formatter.php b/src/utilities/Formatter.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Utilities;
 
+use PHPJava\Exceptions\FormatterException;
+
 class Formatter
 {
     public static function parseSignature($signature, $i = 0)
@@ -17,7 +19,7 @@ public static function parseSignature($signature, $i = 0)
                 case 'V': return 'void';
                 case 'Z': return 'boolean';
             }
-            return 'Undefined';
+            throw new FormatterException('Passed undefined signature ' . $signature);
         };
         $data = [];
         $deepArray = 0;
@@ -68,7 +70,7 @@ public static function parseSignature($signature, $i = 0)
                     for ($i++; $i < $size && $signature[$i] !== ')'; $i++) {
                         $build .= $signature[$i];
                     }
-                    $data['arguments'] = ($build !== '') ? $getMappedSignatureType($build) : [];
+                    $data['arguments'] = ($build !== '') ? static::parseSignature($build) : [];
                     $data['argumentsCount'] = ($data['argumentsCount'] ?? 0) + 1;
                     break;
             }
diff --git a/tools/test.php b/tools/test.php
@@ -8,4 +8,4 @@
     new \PHPJava\Core\JavaClassReader(__DIR__ . '/Test.class')
 );
 $invoker = new JavaClassInvoker($javaClass);
-var_dump($invoker->getDynamicMethods()->main([1, 2, 3]));
+var_dump($invoker->getDynamicMethods()->main([999, 222, 3333]));

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPJava\Core;`
`3`	`3`
`4`		`-use PHPJava\Core\JVM\Field\GetFieldInterface;`
	`4`	`+use PHPJava\Core\JVM\Field\FieldInterface;`
`5`	`5`	`use PHPJava\Core\JVM\Invoker\Invokable;`
`6`	`6`	`use PHPJava\Core\JVM\Invoker\InvokerInterface;`
`7`	`7`	`use PHPJava\Kernel\Maps\AccessFlag;`
`@@ -55,6 +55,9 @@ public function __construct(JavaClass $javaClass)`
`55`	`55`	`$this->staticFields[$fieldName] = $fieldInfo;`
`56`	`56`	`}`
`57`	`57`	`}`
	`58`	`+`
	`59`	`+ // call <clinit>`
	`60`	`+ $this->getStaticMethods()->{'<clinit>'}();`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`public function getJavaClass(): JavaClass`
`@@ -69,16 +72,16 @@ public function getDynamicMethods(): InvokerInterface`
`69`	`72`
`70`	`73`	`public function getStaticMethods(): InvokerInterface`
`71`	`74`	`{`
`72`		`- return new JVM\Invoker\StaticMethodInvoker($this, $this->dynamicMethods);`
	`75`	`+ return new JVM\Invoker\StaticMethodInvoker($this, $this->staticMethods);`
`73`	`76`	`}`
`74`	`77`
`75`		`- public function getDynamicFields(): GetFieldInterface`
	`78`	`+ public function getDynamicFields(): FieldInterface`
`76`	`79`	`{`
`77`		`- return new JVM\Field\DynamicFieldGetter($this, $this->dynamicFields);`
	`80`	`+ return new JVM\Field\DynamicField($this, $this->dynamicFields);`
`78`	`81`	`}`
`79`	`82`
`80`		`- public function getStaticFields(): GetFieldInterface`
	`83`	`+ public function getStaticFields(): JVM\Field\StaticField`
`81`	`84`	`{`
`82`		`- return new JVM\Field\StaticFieldGetter($this, $this->staticFields);`
	`85`	`+ return new JVM\Field\StaticField();`
`83`	`86`	`}`
`84`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`use PHPJava\Core\JavaClassInvoker;`
`5`	`5`
`6`		`-interface GetFieldInterface`
	`6`	`+interface FieldInterface`
`7`	`7`	`{`
`8`	`8`	`public function __construct(JavaClassInvoker $javaClassInvoker, array $fields);`
`9`	`9`	`public function __get($name);`
Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,7 @@ public function __call($name, $arguments)`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- var_dump($codeAttribute);`
`87`		`- exit();`
	`86`	`+ return null;`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`private function getCodeAttribute(array $attributes): ?CodeAttribute`