Avoid use of var

This commit is contained in:
Vaci 2022-03-06 14:33:14 +00:00 committed by Vaci Koblizek
parent 4171577bf0
commit 8c6b9c8caa
3 changed files with 8 additions and 8 deletions

View file

@ -67,7 +67,7 @@ public final class AnyPointer {
} }
final Reader imbue(CapTableReader capTable) { final Reader imbue(CapTableReader capTable) {
var result = new Reader(segment, pointer, nestingLimit); Reader result = new Reader(segment, pointer, nestingLimit);
result.capTable = capTable; result.capTable = capTable;
return result; return result;
} }
@ -83,9 +83,9 @@ public final class AnyPointer {
public final ClientHook getPipelinedCap(short[] ops) { public final ClientHook getPipelinedCap(short[] ops) {
AnyPointer.Reader any = this; AnyPointer.Reader any = this;
for (var pointerIndex: ops) { for (short pointerIndex: ops) {
if (pointerIndex >= 0) { if (pointerIndex >= 0) {
var reader = WireHelpers.readStructPointer(any.segment, any.capTable, any.pointer, null, 0, any.nestingLimit); StructReader reader = WireHelpers.readStructPointer(any.segment, any.capTable, any.pointer, null, 0, any.nestingLimit);
any = reader._getPointerField(AnyPointer.factory, pointerIndex); any = reader._getPointerField(AnyPointer.factory, pointerIndex);
} }
} }
@ -176,7 +176,7 @@ public final class AnyPointer {
} }
public Pipeline getPointerField(short pointerIndex) { public Pipeline getPointerField(short pointerIndex) {
var newOps = new short[this.ops.length + 1]; short[] newOps = new short[this.ops.length + 1];
System.arraycopy(this.ops, 0, newOps, 0, this.ops.length); System.arraycopy(this.ops, 0, newOps, 0, this.ops.length);
newOps[this.ops.length] = pointerIndex; newOps[this.ops.length] = pointerIndex;
return new Pipeline(this.hook, newOps); return new Pipeline(this.hook, newOps);

View file

@ -19,7 +19,7 @@ abstract class ExportTable<T> implements Iterable<T> {
} }
public T erase(int id, T entry) { public T erase(int id, T entry) {
var value = slots.get(id); T value = slots.get(id);
if (value == entry) { if (value == entry) {
freeIds.add(id); freeIds.add(id);
return slots.remove(id); return slots.remove(id);
@ -30,8 +30,8 @@ abstract class ExportTable<T> implements Iterable<T> {
public T next() { public T next() {
int id = freeIds.isEmpty() ? max++ : freeIds.remove(); int id = freeIds.isEmpty() ? max++ : freeIds.remove();
var value = newExportable(id); T value = newExportable(id);
var prev = slots.put(id, value); T prev = slots.put(id, value);
assert prev == null; assert prev == null;
return value; return value;
} }

View file

@ -19,7 +19,7 @@ abstract class ImportTable<T> implements Iterable<T> {
} }
public T erase(int id, T entry) { public T erase(int id, T entry) {
var removed = slots.remove(id, entry); boolean removed = slots.remove(id, entry);
assert removed; assert removed;
return entry; return entry;
} }