Skip to content

Commit 22938ed

Browse files
m3m0r7m3m0r7
committed
Rename reserved keywords from _KEYWORD to KEYWORD_
1 parent 0a2e99b commit 22938ed

File tree

491 files changed

+1327
-1972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

491 files changed

+1327
-1972
lines changed

‎README-ja.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ echo JavaClass::load('java.lang.Math')
300300
- PHP は Java と比べると型がだいぶ曖昧です。そのため、 PHPJava では正確にメソッドを呼び出すための手段をいくつか用意しています。
301301
- 以下は、 `long` パラメータを受け取るメソッドを呼び出す場合の例です。
302302

303-
#### [推奨] パラメータを `\PHPJava\Kernel\Types\_Long` にする。
303+
#### [推奨] パラメータを `\PHPJava\Kernel\Types\Long_ ` にする。
304304
##### Java
305305
```java
306306
class Test
@@ -317,7 +317,7 @@ class Test
317317
<?php
318318
$javaClass->getInvoker()->getStatic()->getMethods()->call(
319319
'includingLongTypeParameter',
320-
new \PHPJava\Kernel\Types\_Long(1234)
320+
new \PHPJava\Kernel\Types\Long_ (1234)
321321
);
322322
```
323323

@@ -474,14 +474,14 @@ public static void main(java.lang.String[])
474474
| Java | PHPJava |
475475
|:-----|:--------|
476476
| null | null |
477-
| boolean | \PHPJava\Kernel\Types\\_Boolean (`__toString` を含む) |
478-
| char | \PHPJava\Kernel\Types\\_Char (`__toString` を含む) |
479-
| byte | \PHPJava\Kernel\Types\\_Byte (`__toString` を含む) |
480-
| short | \PHPJava\Kernel\Types\\_Short (`__toString` を含む) |
481-
| int | \PHPJava\Kernel\Types\\_Int (`__toString` を含む) |
482-
| long | \PHPJava\Kernel\Types\\_Long (`__toString` を含む) |
483-
| float | \PHPJava\Kernel\Types\\_Float (`__toString` を含む) |
484-
| double | \PHPJava\Kernel\Types\\_Double (`__toString` を含む) |
477+
| boolean | \PHPJava\Kernel\Types\\Boolean_ (`__toString` を含む) |
478+
| char | \PHPJava\Kernel\Types\\Char_ (`__toString` を含む) |
479+
| byte | \PHPJava\Kernel\Types\\Byte_ (`__toString` を含む) |
480+
| short | \PHPJava\Kernel\Types\\Short_ (`__toString` を含む) |
481+
| int | \PHPJava\Kernel\Types\\Int_ (`__toString` を含む) |
482+
| long | \PHPJava\Kernel\Types\\Long_ (`__toString` を含む) |
483+
| float | \PHPJava\Kernel\Types\\Float_ (`__toString` を含む) |
484+
| double | \PHPJava\Kernel\Types\\Double_ (`__toString` を含む) |
485485

486486
## Run Kotlin on the PHPJava
487487
## Kotlin を PHPJava で動かす。

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ The example will return `16`.
301301
- For example, you may want to call a method that accepts a `long` parameter in Java from PHP.
302302
In this case, you can call that method as follows:
303303

304-
#### e.g., [Recommended] Wrap with `\PHPJava\Kernel\Types\_Long`.
304+
#### e.g., [Recommended] Wrap with `\PHPJava\Kernel\Types\Long_ `.
305305
##### In Java
306306
```java
307307
class Test
@@ -318,7 +318,7 @@ class Test
318318
<?php
319319
$javaClass->getInvoker()->getStatic()->getMethods()->call(
320320
'includingLongTypeParameter',
321-
new \PHPJava\Kernel\Types\_Long(1234)
321+
new \PHPJava\Kernel\Types\Long_ (1234)
322322
);
323323
```
324324

@@ -474,14 +474,14 @@ public static void main(java.lang.String[])
474474
| Java | PHPJava |
475475
|:-----|:--------|
476476
| null | null |
477-
| boolean | \PHPJava\Kernel\Types\\_Boolean (including `__toString`) |
478-
| char | \PHPJava\Kernel\Types\\_Char (including `__toString`) |
479-
| byte | \PHPJava\Kernel\Types\\_Byte (including `__toString`) |
480-
| short | \PHPJava\Kernel\Types\\_Short (including `__toString`) |
481-
| int | \PHPJava\Kernel\Types\\_Int (including `__toString`) |
482-
| long | \PHPJava\Kernel\Types\\_Long (including `__toString`) |
483-
| float | \PHPJava\Kernel\Types\\_Float (including `__toString`) |
484-
| double | \PHPJava\Kernel\Types\\_Double (including `__toString`) |
477+
| boolean | \PHPJava\Kernel\Types\\Boolean_ (including `__toString`) |
478+
| char | \PHPJava\Kernel\Types\\Char_ (including `__toString`) |
479+
| byte | \PHPJava\Kernel\Types\\Byte_ (including `__toString`) |
480+
| short | \PHPJava\Kernel\Types\\Short_ (including `__toString`) |
481+
| int | \PHPJava\Kernel\Types\\Int_ (including `__toString`) |
482+
| long | \PHPJava\Kernel\Types\\Long_ (including `__toString`) |
483+
| float | \PHPJava\Kernel\Types\\Float_ (including `__toString`) |
484+
| double | \PHPJava\Kernel\Types\\Double_ (including `__toString`) |
485485

486486
## Run Kotlin on the PHPJava
487487
Do you wanna run Kotlin on the PHPJava? Are you serious?

‎docs/compiler/README-ja.md‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ use PHPJava\Compiler\Builder\Finder\ConstantPoolFinder;
1919
use PHPJava\Kernel\Resolvers\SDKVersionResolver;
2020
use PHPJava\Compiler\Lang\Assembler\Enhancer\ConstantPoolEnhancer;
2121
use PHPJava\Compiler\Builder\Signatures\Descriptor;
22-
use PHPJava\Packages\java\lang\_Object;
22+
use PHPJava\Packages\java\lang\Object_;
2323
use PHPJava\Packages\java\io\PrintStream;
24-
use PHPJava\Packages\java\lang\_String;
24+
use PHPJava\Packages\java\lang\String_ ;
2525
use PHPJava\Packages\java\lang\System;
26-
use PHPJava\Kernel\Types\_Void;
26+
use PHPJava\Kernel\Types\Void_ ;
2727
use PHPJava\Compiler\Compiler;
2828
use PHPJava\Compiler\Builder\Structures\ClassFileStructure;
2929
use PHPJava\Compiler\Builder\Signatures\ClassAccessFlag;
@@ -49,7 +49,7 @@ $enhancedConstantPool = ConstantPoolEnhancer::factory(
4949

5050
$enhancedConstantPool
5151
->addString('Hello PHPJava Compiler!')
52-
->addClass(_Object::class)
52+
->addClass(Object_::class)
5353
->addClass('HelloWorld')
5454
->addClass(System::class)
5555
->addClass(PrintStream::class)
@@ -64,15 +64,15 @@ $enhancedConstantPool
6464
PrintStream::class,
6565
'println',
6666
(new Descriptor())
67-
->addArgument(_String::class)
68-
->setReturn(_Void::class)
67+
->addArgument(String_::class)
68+
->setReturn(Void_::class)
6969
->make()
7070
)
7171
->addNameAndType(
7272
'main',
7373
(new Descriptor())
74-
->addArgument(_String::class, 1)
75-
->setReturn(_Void::class)
74+
->addArgument(String_::class, 1)
75+
->setReturn(Void_::class)
7676
->make()
7777
);
7878

@@ -86,7 +86,7 @@ $compiler = new Compiler(
8686
->make()
8787
)
8888
->setThisClass($enhancedConstantPool->findClass('HelloWorld'))
89-
->setSuperClass($enhancedConstantPool->findClass(_Object::class))
89+
->setSuperClass($enhancedConstantPool->findClass(Object_::class))
9090
->setMethods(
9191
(new Methods())
9292
->add(
@@ -98,8 +98,8 @@ $compiler = new Compiler(
9898
$enhancedConstantPool->findUtf8('main'),
9999
$enhancedConstantPool->findUtf8(
100100
(new Descriptor())
101-
->addArgument(_String::class, 1)
102-
->setReturn(_Void::class)
101+
->addArgument(String_::class, 1)
102+
->setReturn(Void_::class)
103103
->make()
104104
)
105105
))
@@ -139,8 +139,8 @@ $compiler = new Compiler(
139139
PrintStream::class,
140140
'println',
141141
(new Descriptor())
142-
->addArgument(_String::class)
143-
->setReturn(_Void::class)
142+
->addArgument(String_::class)
143+
->setReturn(Void_::class)
144144
->make()
145145
)
146146
)
@@ -248,8 +248,8 @@ try {
248248
| Utf8Info | 1 | `$finder->find(Utf8Info::class, 'Hello World!')` |
249249
| ClassInfo | 1 | `$finder->find(ClassInfo::class, 'HelloWorld')` |
250250
| StringInfo | 1 | `$finder->find(StringInfo::class, 'Hello World!')` |
251-
| NameAndTypeInfo | 2 | `$finder->find(NameAndTypeInfo::class, '<init>', (new Descriptor())->setReturn(_Void::class)->make())` |
252-
| MethodrefInfo | 3 | `$finder->find(MethodrefInfo::class, 'java/io/PrintStream', 'println', (new Descriptor())->addArgument(_String::class)->setReturn(_Void::class)->make())` |
251+
| NameAndTypeInfo | 2 | `$finder->find(NameAndTypeInfo::class, '<init>', (new Descriptor())->setReturn(Void_::class)->make())` |
252+
| MethodrefInfo | 3 | `$finder->find(MethodrefInfo::class, 'java/io/PrintStream', 'println', (new Descriptor())->addArgument(String_::class)->setReturn(Void_::class)->make())` |
253253
| FieldrefInfo | 3 | `$finder->find(FieldrefInfo::class, 'java/lang/System', 'out', (new Descriptor())->addArgument(PrintStream::class)->make())` |
254254

255255

@@ -349,21 +349,21 @@ var_dump(
349349
require __DIR__ . '/../vendor/autoload.php';
350350

351351
use PHPJava\Compiler\Builder\Signatures\Descriptor;
352-
use PHPJava\Kernel\Types\_Void;
353-
use PHPJava\Packages\java\lang\_String;
352+
use PHPJava\Kernel\Types\Void_ ;
353+
use PHPJava\Packages\java\lang\String_ ;
354354

355355
(new Descriptor())
356356
// 引数を追加します。 addArgument は何回でも呼ぶことが可能です。
357357
->addArgument(
358358
// 第一引数は java.lang.String
359-
_String::class,
359+
String_::class,
360360
// 配列の深さを指定する。デフォルトは 0
361361
1
362362
)
363363
// 返り値をセットする
364364
->setReturn(
365365
// 返り値は void 型
366-
_Void::class
366+
Void_::class
367367
)
368368
->make();
369369

@@ -417,8 +417,8 @@ $compiler = new Compiler(
417417
$finder->find(
418418
Utf8Info::class,
419419
(new Descriptor())
420-
->addArgument(_String::class, 1)
421-
->setReturn(_Void::class)
420+
->addArgument(String_::class, 1)
421+
->setReturn(Void_::class)
422422
->make()
423423
)
424424
)
@@ -507,8 +507,8 @@ use PHPJava\Compiler\Builder\Types\Uint16;
507507
use PHPJava\Compiler\Builder\Types\Uint8;
508508
use PHPJava\Kernel\Maps\OpCode;
509509

510-
use PHPJava\Kernel\Types\_Void;
511-
use PHPJava\Packages\java\lang\_String;
510+
use PHPJava\Kernel\Types\Void_ ;
511+
use PHPJava\Packages\java\lang\String_ ;
512512

513513
use PHPJava\Packages\java\io\PrintStream;
514514

@@ -557,8 +557,8 @@ use PHPJava\Packages\java\io\PrintStream;
557557
'java/io/PrintStream',
558558
'println',
559559
(new Descriptor())
560-
->addArgument(_String::class)
561-
->setReturn(_Void::class)
560+
->addArgument(String_::class)
561+
->setReturn(Void_::class)
562562
->make()
563563
),
564564
],

‎docs/compiler/README.md‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ use PHPJava\Compiler\Builder\Finder\ConstantPoolFinder;
1919
use PHPJava\Kernel\Resolvers\SDKVersionResolver;
2020
use PHPJava\Compiler\Lang\Assembler\Enhancer\ConstantPoolEnhancer;
2121
use PHPJava\Compiler\Builder\Signatures\Descriptor;
22-
use PHPJava\Packages\java\lang\_Object;
22+
use PHPJava\Packages\java\lang\Object_;
2323
use PHPJava\Packages\java\io\PrintStream;
24-
use PHPJava\Packages\java\lang\_String;
24+
use PHPJava\Packages\java\lang\String_ ;
2525
use PHPJava\Packages\java\lang\System;
26-
use PHPJava\Kernel\Types\_Void;
26+
use PHPJava\Kernel\Types\Void_ ;
2727
use PHPJava\Compiler\Compiler;
2828
use PHPJava\Compiler\Builder\Structures\ClassFileStructure;
2929
use PHPJava\Compiler\Builder\Signatures\ClassAccessFlag;
@@ -51,7 +51,7 @@ $className = 'HelloWorld';
5151

5252
$enhancedConstantPool
5353
->addString('Hello PHPJava Compiler!')
54-
->addClass(_Object::class)
54+
->addClass(Object_::class)
5555
->addClass($className)
5656
->addClass(System::class)
5757
->addClass(PrintStream::class)
@@ -66,15 +66,15 @@ $enhancedConstantPool
6666
PrintStream::class,
6767
'println',
6868
(new Descriptor())
69-
->addArgument(_String::class)
70-
->setReturn(_Void::class)
69+
->addArgument(String_::class)
70+
->setReturn(Void_::class)
7171
->make()
7272
)
7373
->addNameAndType(
7474
'main',
7575
(new Descriptor())
76-
->addArgument(_String::class, 1)
77-
->setReturn(_Void::class)
76+
->addArgument(String_::class, 1)
77+
->setReturn(Void_::class)
7878
->make()
7979
);
8080

@@ -88,7 +88,7 @@ $compiler = new Compiler(
8888
->make()
8989
)
9090
->setThisClass($enhancedConstantPool->findClass($className))
91-
->setSuperClass($enhancedConstantPool->findClass(_Object::class))
91+
->setSuperClass($enhancedConstantPool->findClass(Object_::class))
9292
->setMethods(
9393
(new Methods())
9494
->add(
@@ -100,8 +100,8 @@ $compiler = new Compiler(
100100
$className,
101101
'main',
102102
(new Descriptor())
103-
->addArgument(_String::class, 1)
104-
->setReturn(_Void::class)
103+
->addArgument(String_::class, 1)
104+
->setReturn(Void_::class)
105105
->make()
106106
))
107107
->setConstantPool($constantPool)
@@ -142,8 +142,8 @@ $compiler = new Compiler(
142142
PrintStream::class,
143143
'println',
144144
(new Descriptor())
145-
->addArgument(_String::class)
146-
->setReturn(_Void::class)
145+
->addArgument(String_::class)
146+
->setReturn(Void_::class)
147147
->make()
148148
)
149149
)
@@ -250,8 +250,8 @@ You can find by the entries shown below:
250250
| Utf8Info | 1 | `$finder->find(Utf8Info::class, 'Hello World!')` |
251251
| ClassInfo | 1 | `$finder->find(ClassInfo::class, 'HelloWorld')` |
252252
| StringInfo | 1 | `$finder->find(StringInfo::class, 'Hello World!')` |
253-
| NameAndTypeInfo | 2 | `$finder->find(NameAndTypeInfo::class, '<init>', (new Descriptor())->setReturn(_Void::class)->make())` |
254-
| MethodrefInfo | 3 | `$finder->find(MethodrefInfo::class, 'java/io/PrintStream', 'println', (new Descriptor())->addArgument(_String::class)->setReturn(_Void::class)->make())` |
253+
| NameAndTypeInfo | 2 | `$finder->find(NameAndTypeInfo::class, '<init>', (new Descriptor())->setReturn(Void_::class)->make())` |
254+
| MethodrefInfo | 3 | `$finder->find(MethodrefInfo::class, 'java/io/PrintStream', 'println', (new Descriptor())->addArgument(String_::class)->setReturn(Void_::class)->make())` |
255255
| FieldrefInfo | 3 | `$finder->find(FieldrefInfo::class, 'java/lang/System', 'out', (new Descriptor())->addArgument(PrintStream::class)->make())` |
256256

257257

@@ -350,21 +350,21 @@ To use `Descriptor Signature Builder`:
350350
require __DIR__ . '/../vendor/autoload.php';
351351

352352
use PHPJava\Compiler\Builder\Signatures\Descriptor;
353-
use PHPJava\Kernel\Types\_Void;
354-
use PHPJava\Packages\java\lang\_String;
353+
use PHPJava\Kernel\Types\Void_ ;
354+
use PHPJava\Packages\java\lang\String_ ;
355355

356356
(new Descriptor())
357357
// Add an argument. addArgument can be called any times.
358358
->addArgument(
359359
// The first argument is a java.lang.String
360-
_String::class,
360+
String_::class,
361361
// Set the depth of an array. Defaults to zero.
362362
1
363363
)
364364
// Set the return value
365365
->setReturn(
366366
// The return value is void.
367-
_Void::class
367+
Void_::class
368368
)
369369
->make();
370370

@@ -418,8 +418,8 @@ $compiler = new Compiler(
418418
$finder->find(
419419
Utf8Info::class,
420420
(new Descriptor())
421-
->addArgument(_String::class, 1)
422-
->setReturn(_Void::class)
421+
->addArgument(String_::class, 1)
422+
->setReturn(Void_::class)
423423
->make()
424424
)
425425
)
@@ -508,8 +508,8 @@ use PHPJava\Compiler\Builder\Types\Uint16;
508508
use PHPJava\Compiler\Builder\Types\Uint8;
509509
use PHPJava\Kernel\Maps\OpCode;
510510

511-
use PHPJava\Kernel\Types\_Void;
512-
use PHPJava\Packages\java\lang\_String;
511+
use PHPJava\Kernel\Types\Void_ ;
512+
use PHPJava\Packages\java\lang\String_ ;
513513

514514
use PHPJava\Packages\java\io\PrintStream;
515515

@@ -558,8 +558,8 @@ use PHPJava\Packages\java\io\PrintStream;
558558
'java/io/PrintStream',
559559
'println',
560560
(new Descriptor())
561-
->addArgument(_String::class)
562-
->setReturn(_Void::class)
561+
->addArgument(String_::class)
562+
->setReturn(Void_::class)
563563
->make()
564564
),
565565
],

‎phpcs.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<exclude-pattern>./src/Kernel/Types</exclude-pattern>
1414
<exclude-pattern>./src/Kernel/Mnemonics</exclude-pattern>
1515
<exclude-pattern>./src/Kernel/Structures</exclude-pattern>
16-
<exclude-pattern>./src/Packages/PHPJava/Extended/_Object.php</exclude-pattern>
16+
<exclude-pattern>./src/Packages/PHPJava/Extended/Object_.php</exclude-pattern>
1717
<exclude-pattern>./src/Packages/java/*</exclude-pattern>
1818
</rule>
1919

@@ -23,7 +23,7 @@
2323

2424

2525
<rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
26-
<exclude-pattern>./src/Packages/PHPJava/Extended/_Object.php</exclude-pattern>
26+
<exclude-pattern>./src/Packages/PHPJava/Extended/Object_.php</exclude-pattern>
2727
<exclude-pattern>./src/Packages/java/*</exclude-pattern>
2828
</rule>
2929

0 commit comments

Comments
 (0)