Skip to content

Commit 9cce041

Browse files
m3m0r7m3m0r7
committed
Rename deep_array to dimensions_of_array
1 parent e1bb29d commit 9cce041

File tree

9 files changed

+38
-38
lines changed

9 files changed

+38
-38
lines changed

‎src/Compiler/Builder/Attributes/StackMapTable.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ static function (array $carry, FullFrame $frame) use (&$entries) {
242242
$writer->writeUnsignedShort($entry->getOffsetDelta());
243243
$locals = [];
244244
foreach ($this->localVariables as $variableName => $variable) {
245-
[$index, $classType, $deepArray] = $variable;
246-
$classType = Formatter::buildSignature($classType, $deepArray);
245+
[$index, $classType, $dimensionsOfArray] = $variable;
246+
$classType = Formatter::buildSignature($classType, $dimensionsOfArray);
247247
$locals[$index] = [
248248
VerificationTypeTag::ITEM_Object,
249249
$this->getEnhancedConstantPool()

‎src/Compiler/Builder/Signatures/Descriptor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public function make(): string
4040
$arguments = implode(
4141
array_map(
4242
static function (array $argument) {
43-
[$type, $deepArray] = $argument;
44-
$string = str_repeat('[', $deepArray);
43+
[$type, $dimensionsOfArray] = $argument;
44+
$string = str_repeat('[', $dimensionsOfArray);
4545
$type = Formatter::convertStringifiedPrimitiveTypeToKernelType(
4646
ltrim($type, '\\')
4747
);

‎src/Compiler/Lang/Assembler/MethodAssembler.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ public function assemble(): void
6868
$this->assembleAssignVariable(
6969
$keyName,
7070
$value['type'],
71-
$value['deep_array']
71+
$value['dimensions_of_array']
7272
);
7373

7474
$descriptorObject->addArgument(
7575
$value['type'],
76-
$value['deep_array']
76+
$value['dimensions_of_array']
7777
);
7878
}
7979

‎src/Compiler/Lang/Assembler/Store/Store.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function getAll(): array
2929
* @param $value
3030
* @return int the store method returns settled local storage number
3131
*/
32-
public function store(string $name, $value, int $deepArray = 0): int
32+
public function store(string $name, $value, int $dimensionsOfArray = 0): int
3333
{
3434
$availableLocalStorageNumber = $this->getAvailableLocalStorageNumber();
3535

@@ -41,7 +41,7 @@ public function store(string $name, $value, int $deepArray = 0): int
4141
$availableLocalStorageNumber = $this->getAvailableLocalStorageNumber();
4242
}
4343

44-
$this->hashTable[$name] = [$availableLocalStorageNumber, $value, $deepArray];
44+
$this->hashTable[$name] = [$availableLocalStorageNumber, $value, $dimensionsOfArray];
4545

4646
// Use available localStorage number
4747
$this->fill(

‎src/Compiler/Lang/Assembler/Traits/Enhancer/Operation/LocalVariableAssignable.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
*/
1818
trait LocalVariableAssignable
1919
{
20-
public function assembleAssignVariable(string $variableName, string $classType, int $deepArray = 0): array
20+
public function assembleAssignVariable(string $variableName, string $classType, int $dimensionsOfArray = 0): array
2121
{
2222
$localStorageNumber = $this->getStore()->store(
2323
$variableName,
2424
$classType,
25-
$deepArray
25+
$dimensionsOfArray
2626
);
2727

2828
return $this->assembleStoreOperation(

‎src/Compiler/Lang/Assembler/Traits/ParameterParseable.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ public function parseParameterFromNode(Node $node, array $defaultParameters = []
6464
)
6565
)
6666
),
67-
'deep_array' => substr_count($type, '[]'),
67+
'dimensions_of_array' => substr_count($type, '[]'),
6868
'order' => $paramOrdersTable[$variableName],
6969
];
7070

7171
$definedType = $parameters[$variableName]['type'];
72-
$definedTypeDimensionsOfArray = $parameters[$variableName]['deep_array'];
72+
$definedTypeDimensionsOfArray = $parameters[$variableName]['dimensions_of_array'];
7373

7474
if (!\PHPJava\Kernel\Resolvers\TypeResolver::isPrimitive($definedType)) {
7575
$className = Formatter::buildSignature(

‎src/Kernel/Filters/Normalizer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static function normalizeFields(array $fields, JavaClassInterface $fromJa
7272
*/
7373
$cp = $value->getConstantPool();
7474
$descriptor = Formatter::parseSignature($cp[$value->getDescriptorIndex()]->getString());
75-
[$type, $class, $deepArray] = TypeResolver::getType($descriptor[0]);
75+
[$type, $class, $dimensionsOfArray] = TypeResolver::getType($descriptor[0]);
7676

7777
switch ($type) {
7878
case TypeResolver::IS_PRIMITIVE:

‎src/Kernel/Resolvers/TypeResolver.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public static function getType(array $signatureArray): array
148148
if (!static::isPrimitive($type)) {
149149
$signatureType = static::IS_CLASS;
150150
}
151-
if ($signatureArray['deep_array'] > 0) {
151+
if ($signatureArray['dimensions_of_array'] > 0) {
152152
$signatureType = static::IS_ARRAY;
153153
}
154154
if ($typeName === null) {
@@ -157,7 +157,7 @@ public static function getType(array $signatureArray): array
157157
return [
158158
$signatureType,
159159
$typeName,
160-
$signatureArray['deep_array'],
160+
$signatureArray['dimensions_of_array'],
161161
];
162162
}
163163

@@ -186,9 +186,9 @@ public static function convertJavaTypeSimplyForPHP(string $type): string
186186
public static function convertPHPtoJava($arguments, string $defaultJavaArgumentType = _String::class): array
187187
{
188188
$phpType = gettype($arguments);
189-
$deepArray = 0;
189+
$dimensionsOfArray = 0;
190190
if ($phpType === 'array') {
191-
$deepArray++;
191+
$dimensionsOfArray++;
192192
$getNestedValues = [];
193193
foreach ($arguments as $argument) {
194194
$getNestedValues[] = static::convertPHPtoJava($argument, $defaultJavaArgumentType);
@@ -199,18 +199,18 @@ public static function convertPHPtoJava($arguments, string $defaultJavaArgumentT
199199
if (!static::isPrimitive($resolveType)) {
200200
return [
201201
'type' => $defaultJavaArgumentType,
202-
'deep_array' => $deepArray,
202+
'dimensions_of_array' => $dimensionsOfArray,
203203
];
204204
}
205205
return [
206206
'type' => $resolveType,
207-
'deep_array' => $deepArray,
207+
'dimensions_of_array' => $dimensionsOfArray,
208208
];
209209
}
210210
$firstParameter = $getNestedValues[0];
211211

212212
// TODO: Validate Parameters
213-
$firstParameter['deep_array'] += $deepArray;
213+
$firstParameter['dimensions_of_array'] += $dimensionsOfArray;
214214
return $firstParameter;
215215
}
216216
if ($phpType === 'object') {
@@ -219,19 +219,19 @@ public static function convertPHPtoJava($arguments, string $defaultJavaArgumentT
219219
'type' => Formatter::convertPHPNamespacesToJava(
220220
$arguments->getClassName()
221221
),
222-
'deep_array' => $deepArray,
222+
'dimensions_of_array' => $dimensionsOfArray,
223223
];
224224
}
225225
if ($arguments instanceof PrimitiveValueInterface) {
226226
return [
227227
'type' => get_class($arguments),
228-
'deep_array' => $deepArray,
228+
'dimensions_of_array' => $dimensionsOfArray,
229229
];
230230
}
231231
if ($arguments instanceof Collection) {
232232
return [
233233
'type' => $arguments->getType($defaultJavaArgumentType),
234-
'deep_array' => $deepArray,
234+
'dimensions_of_array' => $dimensionsOfArray,
235235
];
236236
}
237237
throw new TypeException(get_class($arguments) . ' does not supported to convert to Java\'s argument.');
@@ -241,13 +241,13 @@ public static function convertPHPtoJava($arguments, string $defaultJavaArgumentT
241241
if (!static::isPrimitive($resolveType)) {
242242
return [
243243
'type' => substr(static::PHP_TYPE_MAP[$phpType], 1),
244-
'deep_array' => $deepArray,
244+
'dimensions_of_array' => $dimensionsOfArray,
245245
];
246246
}
247247

248248
return [
249249
'type' => $resolveType,
250-
'deep_array' => $deepArray,
250+
'dimensions_of_array' => $dimensionsOfArray,
251251
];
252252
}
253253

‎src/Utilities/Formatter.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Formatter
2222
public static function parseSignature(string $signature, int $i = 0): array
2323
{
2424
$data = [];
25-
$deepArray = 0;
25+
$dimensionsOfArray = 0;
2626

2727
for ($size = strlen($signature); $i < $size;) {
2828
switch ($signature[$i]) {
@@ -37,9 +37,9 @@ public static function parseSignature(string $signature, int $i = 0): array
3737
case 'Z':
3838
$data[] = [
3939
'type' => TypeResolver::getMappedSignatureType($signature[$i]),
40-
'deep_array' => $deepArray,
40+
'dimensions_of_array' => $dimensionsOfArray,
4141
];
42-
$deepArray = 0;
42+
$dimensionsOfArray = 0;
4343
break;
4444
case 'L':
4545
// class name
@@ -51,16 +51,16 @@ public static function parseSignature(string $signature, int $i = 0): array
5151
[, $className] = Formatter::convertJavaNamespaceToPHP($build);
5252
$data[] = [
5353
'type' => $className,
54-
'deep_array' => $deepArray,
54+
'dimensions_of_array' => $dimensionsOfArray,
5555
];
56-
$deepArray = 0;
56+
$dimensionsOfArray = 0;
5757

5858
break;
5959
case '[':
6060
// array
61-
$deepArray++;
61+
$dimensionsOfArray++;
6262
for ($i++; $signature[$i] === '['; $i++) {
63-
$deepArray++;
63+
$dimensionsOfArray++;
6464
}
6565
// loop
6666
continue 2;
@@ -83,7 +83,7 @@ public static function buildArgumentsSignature(array $signatures): string
8383
{
8484
$string = '';
8585
foreach ($signatures as $signature) {
86-
$build = str_repeat('[', $signature['deep_array']);
86+
$build = str_repeat('[', $signature['dimensions_of_array']);
8787
if (!TypeResolver::isPrimitive($signature['type'])) {
8888
$build .= 'L' . str_replace('/', '.', $signature['type']);
8989
} else {
@@ -107,7 +107,7 @@ public static function signatureConvertToAmbiguousForPHP(array $signatures): arr
107107
if ($type === _String::class) {
108108
$result[] = [
109109
'type' => $type,
110-
'deep_array' => $signature['deep_array'],
110+
'dimensions_of_array' => $signature['dimensions_of_array'],
111111
];
112112
continue;
113113
}
@@ -117,17 +117,17 @@ public static function signatureConvertToAmbiguousForPHP(array $signatures): arr
117117
return $result;
118118
}
119119

120-
public static function buildSignature(string $type, int $deepArray): string
120+
public static function buildSignature(string $type, int $dimensionsOfArray): string
121121
{
122122
switch ($type) {
123123
default:
124-
return str_repeat('[', $deepArray) . 'L' . static::convertPHPNamespacesToJava($type) . ';';
124+
return str_repeat('[', $dimensionsOfArray) . 'L' . static::convertPHPNamespacesToJava($type) . ';';
125125
}
126126
throw new FormatterException(
127127
sprintf(
128128
'Cannot build a signature (type: %s, array depth: %s)',
129129
$type,
130-
$deepArray
130+
$dimensionsOfArray
131131
)
132132
);
133133
}
@@ -210,7 +210,7 @@ public static function beatifyMethodFromConstantPool(_MethodInfo $method, Consta
210210
', ',
211211
array_map(
212212
function ($argument) {
213-
return static::convertVisuallyJavaSignature($argument['type']) . str_repeat('[]', $argument['deep_array']);
213+
return static::convertVisuallyJavaSignature($argument['type']) . str_repeat('[]', $argument['dimensions_of_array']);
214214
},
215215
$descriptor['arguments']
216216
)

0 commit comments

Comments
 (0)