WIP commit

m3m0r7 · m3m0r7 · commit f8c671966098 · 2019-02-25T00:42:48.000+09:00
diff --git a/src/core/jvm/field/StaticField.php b/src/core/jvm/field/StaticField.php
@@ -2,16 +2,29 @@
 namespace PHPJava\Core\JVM\Field;
 
 use PHPJava\Core\JavaClassInvoker;
+use PHPJava\Imitation\java\lang\_String;
+use PHPJava\Imitation\java\lang\NoSuchFieldException;
 
 class StaticField
 {
     private static $fields = [];
 
-    public function __get($name)
+    /**
+     * @param $name
+     * @return mixed
+     * @throws NoSuchFieldException
+     */
+    public function get($name)
     {
+        if (!isset(static::$fields[$name])) {
+            throw new NoSuchFieldException('Get to undefined static field ' . $name);
+        }
+        if (static::$fields[$name] instanceof _String) {
+            return (string) static::$fields[$name];
+        }
         return static::$fields[$name];
     }
-    public function __set($name, $value)
+    public function set($name, $value)
     {
         static::$fields[$name] = $value;
     }
diff --git a/src/core/jvm/invoker/Invokable.php b/src/core/jvm/invoker/Invokable.php
@@ -55,7 +55,7 @@ public function call(string $name, ...$arguments)
          */
         $method = $this->methods[$name] ?? null;
         if ($method === null) {
-            throw new UndefinedMethodException('Undefined ' . $name . ' method.');
+            throw new UndefinedMethodException('Call to undefined ' . $name . ' method.');
         }
 
         $codeAttribute = $getCodeAttribute($method->getAttributes());
@@ -95,7 +95,7 @@ public function call(string $name, ...$arguments)
             $mnemonic = $mnemonicMap->getName($opcode);
 
             if ($mnemonic === null) {
-                throw new UndefinedOpCodeException('Undefined OpCode ' . sprintf('0x%X', $cursor) . '.');
+                throw new UndefinedOpCodeException('Call to undefined OpCode ' . sprintf('0x%X', $cursor) . '.');
             }
             $pointer = $reader->getOffset() - 1;
 
diff --git a/src/imitation/java/lang/NoSuchFieldException.php b/src/imitation/java/lang/NoSuchFieldException.php
@@ -0,0 +1,7 @@
+<?php
+namespace PHPJava\Imitation\java\lang;
+
+class NoSuchFieldException extends ReflectiveOperationException
+{
+
+}
diff --git a/src/kernel/mnemonics/_getstatic.php b/src/kernel/mnemonics/_getstatic.php
@@ -32,7 +32,7 @@ public function execute(): void
 
                 // push stack
                 $fieldName = $cpInfo[$field->getNameIndex()]->getString();
-                $this->pushStack($this->javaClassInvoker->getStaticFields()->$fieldName);
+                $this->pushStack($this->javaClassInvoker->getStaticFields()->get($fieldName));
                 return;
             }
         }
diff --git a/src/kernel/mnemonics/_putstatic.php b/src/kernel/mnemonics/_putstatic.php
@@ -18,6 +18,6 @@ public function execute(): void
         $class = $cpInfo[$cp->getNameAndTypeIndex()];
         $fieldName = $cpInfo[$class->getNameIndex()]->getString();
 
-        ($this->javaClassInvoker->getStaticFields())->$fieldName = $this->getStack();
+        $this->javaClassInvoker->getStaticFields()->set($fieldName, $this->getStack());
     }
 }
diff --git a/tools/test.php b/tools/test.php
@@ -14,4 +14,7 @@
     [99999, 55555, 333333]
 );
 
+var_dump($javaClass->getInvoker()->getStaticFields()->get('c'));
+var_dump($javaClass->getInvoker()->getStaticFields()->get('b'));
+
 $javaClass->debug();

Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,29 @@`
`2`	`2`	`namespace PHPJava\Core\JVM\Field;`
`3`	`3`
`4`	`4`	`use PHPJava\Core\JavaClassInvoker;`
	`5`	`+use PHPJava\Imitation\java\lang\_String;`
	`6`	`+use PHPJava\Imitation\java\lang\NoSuchFieldException;`
`5`	`7`
`6`	`8`	`class StaticField`
`7`	`9`	`{`
`8`	`10`	`private static $fields = [];`
`9`	`11`
`10`		`- public function __get($name)`
	`12`	`+ /**`
	`13`	`+ * @param $name`
	`14`	`+ * @return mixed`
	`15`	`+ * @throws NoSuchFieldException`
	`16`	`+ */`
	`17`	`+ public function get($name)`
`11`	`18`	`{`
	`19`	`+ if (!isset(static::$fields[$name])) {`
	`20`	`+ throw new NoSuchFieldException('Get to undefined static field ' . $name);`
	`21`	`+ }`
	`22`	`+ if (static::$fields[$name] instanceof _String) {`
	`23`	`+ return (string) static::$fields[$name];`
	`24`	`+ }`
`12`	`25`	`return static::$fields[$name];`
`13`	`26`	`}`
`14`		`- public function __set($name, $value)`
	`27`	`+ public function set($name, $value)`
`15`	`28`	`{`
`16`	`29`	`static::$fields[$name] = $value;`
`17`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function call(string $name, ...$arguments)`
`55`	`55`	`*/`
`56`	`56`	`$method = $this->methods[$name] ?? null;`
`57`	`57`	`if ($method === null) {`
`58`		`- throw new UndefinedMethodException('Undefined ' . $name . ' method.');`
	`58`	`+ throw new UndefinedMethodException('Call to undefined ' . $name . ' method.');`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`$codeAttribute = $getCodeAttribute($method->getAttributes());`
`@@ -95,7 +95,7 @@ public function call(string $name, ...$arguments)`
`95`	`95`	`$mnemonic = $mnemonicMap->getName($opcode);`
`96`	`96`
`97`	`97`	`if ($mnemonic === null) {`
`98`		`- throw new UndefinedOpCodeException('Undefined OpCode ' . sprintf('0x%X', $cursor) . '.');`
	`98`	`+ throw new UndefinedOpCodeException('Call to undefined OpCode ' . sprintf('0x%X', $cursor) . '.');`
`99`	`99`	`}`
`100`	`100`	`$pointer = $reader->getOffset() - 1;`
`101`	`101`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
 +namespace PHPJava\Imitation\java\lang;
++
 +class NoSuchFieldException extends ReflectiveOperationException
 +{
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function execute(): void`
`32`	`32`
`33`	`33`	`// push stack`
`34`	`34`	`$fieldName = $cpInfo[$field->getNameIndex()]->getString();`
`35`		`- $this->pushStack($this->javaClassInvoker->getStaticFields()->$fieldName);`
	`35`	`+ $this->pushStack($this->javaClassInvoker->getStaticFields()->get($fieldName));`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ public function execute(): void`
`18`	`18`	`$class = $cpInfo[$cp->getNameAndTypeIndex()];`
`19`	`19`	`$fieldName = $cpInfo[$class->getNameIndex()]->getString();`
`20`	`20`
`21`		`- ($this->javaClassInvoker->getStaticFields())->$fieldName = $this->getStack();`
	`21`	`+ $this->javaClassInvoker->getStaticFields()->set($fieldName, $this->getStack());`
`22`	`22`	`}`
`23`	`23`	`}`