dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Elements. Standardize to Uint30/Uint32 in binary I/O.

Browse Source 
Unify method names to use `Uint` (not `UInt`) for 30- and 32-bit helpers
across analyzer binaries. This aligns with Dart’s `dart:typed_data`
naming (e.g., `Uint8List`) and removes mixed spelling that caused
confusion. Behavior and wire format are unchanged; this is a pure API
rename with call-site updates.

Key renames (old → new):
- `readUInt30` → `readUint30`
- `readOptionalUInt30` → `readOptionalUint30`
- `readUInt30List` → `readUint30List`
- `readUInt32` → `readUint32`
- `readUInt32List` → `readUint32List`
- `writeUInt30` → `writeUint30`
- `writeOptionalUInt30` → `writeOptionalUint30`
- `writeUInt32` → `writeUint32`

Internal helpers were updated similarly (e.g., `_readUInt32` →
`_readUint32`, `_writeUInt30` → `_writeUint30`), and all uses in
`binary_reader.dart`, `binary_writer.dart`, string tables, unlinked
data, fine-manifest code, and summary2 readers/writers were adjusted.

Rationale:
- Consistent API surface that matches Dart conventions.
- Clearer intent for unsigned-width encodings.
- Zero impact on serialization format or runtime behavior.

Change-Id: I0d76239da8809b0187e8db975ec35cb46d08aab0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449144
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov
2025-09-12 09:17:59 -07:00
committed by Commit Queue
parent 74f753f32d
commit ea8da90d20
15 changed files with 218 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/analyzer/lib/src/binary/binary_reader.dart
+16 -16
View File
@@ -79,7 +79,7 @@ class SummaryDataReader {
required K Function() readKey,
required V Function() readValue,
}) {
var length = readUInt30();
var length = readUint30();
if (length == 0) {
return const {};
}
@@ -119,16 +119,16 @@ class SummaryDataReader {
}
}
int? readOptionalUInt30() {
int? readOptionalUint30() {
if (readBool()) {
return readUInt30();
return readUint30();
} else {
return null;
}
}
String readStringReference() {
var index = readUInt30();
var index = readUint30();
return stringOfIndex(index);
}
@@ -146,7 +146,7 @@ class SummaryDataReader {
}
Set<String> readStringUtf8Set() {
var length = readUInt30();
var length = readUint30();
var result = <String>{};
for (var i = 0; i < length; i++) {
var item = readStringUtf8();
@@ -156,7 +156,7 @@ class SummaryDataReader {
}
List<T> readTypedList<T>(T Function() read) {
var length = readUInt30();
var length = readUint30();
if (length == 0) {
return const <Never>[];
}
@@ -166,7 +166,7 @@ class SummaryDataReader {
}
List<T> readTypedListCast<T>(Object? Function() read) {
var length = readUInt30();
var length = readUint30();
if (length == 0) {
return const <Never>[];
}
@@ -175,7 +175,7 @@ class SummaryDataReader {
}, growable: false);
}
int readUInt30() {
int readUint30() {
var byte = readByte();
if (byte & 0x80 == 0) {
// 0xxxxxxx
@@ -192,33 +192,33 @@ class SummaryDataReader {
}
}
Uint32List readUInt30List() {
var length = readUInt30();
Uint32List readUint30List() {
var length = readUint30();
var result = Uint32List(length);
for (var i = 0; i < length; ++i) {
result[i] = readUInt30();
result[i] = readUint30();
}
return result;
}
int readUInt32() {
int readUint32() {
return (readByte() << 24) |
(readByte() << 16) |
(readByte() << 8) |
readByte();
}
Uint32List readUInt32List() {
var length = readUInt32();
Uint32List readUint32List() {
var length = readUint32();
var result = Uint32List(length);
for (var i = 0; i < length; ++i) {
result[i] = readUInt32();
result[i] = readUint32();
}
return result;
}
Uint8List readUint8List() {
var length = readUInt30();
var length = readUint30();
var result = Uint8List.sublistView(bytes, offset, offset + length);
offset += length;
return result;
pkg/analyzer/lib/src/binary/binary_writer.dart
+10 -10
View File
@@ -126,7 +126,7 @@ class BufferedSink {
}
void writeList<T>(List<T> items, void Function(T x) writeItem) {
writeUInt30(items.length);
writeUint30(items.length);
for (var i = 0; i < items.length; i++) {
writeItem(items[i]);
}
@@ -137,7 +137,7 @@ class BufferedSink {
required void Function(K key) writeKey,
required void Function(V value) writeValue,
}) {
writeUInt30(map.length);
writeUint30(map.length);
for (var entry in map.entries) {
writeKey(entry.key);
writeValue(entry.value);
@@ -171,10 +171,10 @@ class BufferedSink {
}
}
void writeOptionalUInt30(int? value) {
void writeOptionalUint30(int? value) {
if (value != null) {
writeBool(true);
writeUInt30(value);
writeUint30(value);
} else {
writeBool(false);
}
@@ -187,14 +187,14 @@ class BufferedSink {
}
void writeStringUtf8Iterable(Iterable<String> items) {
writeUInt30(items.length);
writeUint30(items.length);
for (var item in items) {
writeStringUtf8(item);
}
}
@pragma("vm:prefer-inline")
void writeUInt30(int value) {
void writeUint30(int value) {
assert(value >= 0 && value >> 30 == 0);
if (value < 0x80) {
_addByte(value);
@@ -212,13 +212,13 @@ class BufferedSink {
void writeUint30List(List<int> values) {
var length = values.length;
writeUInt30(length);
writeUint30(length);
for (var i = 0; i < length; i++) {
writeUInt30(values[i]);
writeUint30(values[i]);
}
}
void writeUInt32(int value) {
void writeUint32(int value) {
_addByte4(
(value >> 24) & 0xFF,
(value >> 16) & 0xFF,
@@ -228,7 +228,7 @@ class BufferedSink {
}
void writeUint8List(Uint8List bytes) {
writeUInt30(bytes.length);
writeUint30(bytes.length);
writeBytes(bytes);
}
pkg/analyzer/lib/src/binary/string_table.dart
+5 -5
View File
@@ -36,7 +36,7 @@ class StringIndexer {
var resultOffset = sink.offset;
var lengthOfBytes = sink.offset - bytesOffset;
sink.writeUInt30(lengthOfBytes);
sink.writeUint30(lengthOfBytes);
sink.writeUint30List(lengths);
return resultOffset;
@@ -96,12 +96,12 @@ class StringTable {
StringTable({required Uint8List bytes, required int startOffset})
: _bytes = bytes,
_byteOffset = startOffset {
var offset = startOffset - _readUInt30();
var length = _readUInt30();
var offset = startOffset - _readUint30();
var length = _readUint30();
_offsets = Uint32List(length + 1);
for (var i = 0; i < length; i++) {
var stringLength = _readUInt30();
var stringLength = _readUint30();
_offsets[i] = offset;
offset += stringLength;
}
@@ -139,7 +139,7 @@ class StringTable {
return String.fromCharCodes(_bytes, start, end);
}
int _readUInt30() {
int _readUint30() {
var byte = _readByte();
if (byte & 0x80 == 0) {
// 0xxxxxxx
pkg/analyzer/lib/src/dart/analysis/unlinked_data.dart
+23 -23
View File
@@ -77,16 +77,16 @@ class UnlinkedCombinator {
factory UnlinkedCombinator.read(SummaryDataReader reader) {
return UnlinkedCombinator(
keywordOffset: reader.readUInt30(),
endOffset: reader.readUInt30(),
keywordOffset: reader.readUint30(),
endOffset: reader.readUint30(),
isShow: reader.readBool(),
names: reader.readStringUtf8List(),
);
}
void write(BufferedSink sink) {
sink.writeUInt30(keywordOffset);
sink.writeUInt30(endOffset);
sink.writeUint30(keywordOffset);
sink.writeUint30(endOffset);
sink.writeBool(isShow);
sink.writeStringUtf8Iterable(names);
}
@@ -163,7 +163,7 @@ class UnlinkedLibraryExportDirective extends UnlinkedNamespaceDirective {
configurations: reader.readTypedList(
() => UnlinkedNamespaceDirectiveConfiguration.read(reader),
),
exportKeywordOffset: reader.readUInt30(),
exportKeywordOffset: reader.readUint30(),
uri: reader.readOptionalStringUtf8(),
);
}
@@ -175,7 +175,7 @@ class UnlinkedLibraryExportDirective extends UnlinkedNamespaceDirective {
) {
x.write(sink);
});
sink.writeUInt30(exportKeywordOffset);
sink.writeUint30(exportKeywordOffset);
sink.writeOptionalStringUtf8(uri);
}
}
@@ -203,7 +203,7 @@ class UnlinkedLibraryImportDirective extends UnlinkedNamespaceDirective {
configurations: reader.readTypedList(
() => UnlinkedNamespaceDirectiveConfiguration.read(reader),
),
importKeywordOffset: reader.readUInt30() - 1,
importKeywordOffset: reader.readUint30() - 1,
isDocImport: reader.readBool(),
isSyntheticDartCore: reader.readBool(),
prefix: reader.readOptionalObject(
@@ -220,7 +220,7 @@ class UnlinkedLibraryImportDirective extends UnlinkedNamespaceDirective {
) {
x.write(sink);
});
sink.writeUInt30(1 + importKeywordOffset);
sink.writeUint30(1 + importKeywordOffset);
sink.writeBool(isDocImport);
sink.writeBool(isSyntheticDartCore);
sink.writeOptionalObject<UnlinkedLibraryImportPrefix>(
@@ -246,9 +246,9 @@ class UnlinkedLibraryImportPrefix {
factory UnlinkedLibraryImportPrefix.read(SummaryDataReader reader) {
return UnlinkedLibraryImportPrefix(
deferredOffset: reader.readOptionalUInt30(),
asOffset: reader.readUInt30(),
nameOffset: reader.readUInt30(),
deferredOffset: reader.readOptionalUint30(),
asOffset: reader.readUint30(),
nameOffset: reader.readUint30(),
name: reader.readOptionalObject(
() => UnlinkedLibraryImportPrefixName.read(reader),
),
@@ -256,9 +256,9 @@ class UnlinkedLibraryImportPrefix {
}
void write(BufferedSink sink) {
sink.writeOptionalUInt30(deferredOffset);
sink.writeUInt30(asOffset);
sink.writeUInt30(nameOffset);
sink.writeOptionalUint30(deferredOffset);
sink.writeUint30(asOffset);
sink.writeUint30(nameOffset);
sink.writeOptionalObject(name, (name) {
name.write(sink);
});
@@ -277,13 +277,13 @@ class UnlinkedLibraryImportPrefixName {
factory UnlinkedLibraryImportPrefixName.read(SummaryDataReader reader) {
return UnlinkedLibraryImportPrefixName(
name: reader.readStringUtf8(),
nameOffset: reader.readUInt30(),
nameOffset: reader.readUint30(),
);
}
void write(BufferedSink sink) {
sink.writeStringUtf8(name);
sink.writeUInt30(nameOffset);
sink.writeUint30(nameOffset);
}
}
@@ -355,7 +355,7 @@ class UnlinkedPartDirective extends UnlinkedConfigurableUriDirective {
configurations: reader.readTypedList(
() => UnlinkedNamespaceDirectiveConfiguration.read(reader),
),
partKeywordOffset: reader.readUInt30(),
partKeywordOffset: reader.readUint30(),
uri: reader.readOptionalStringUtf8(),
);
}
@@ -366,7 +366,7 @@ class UnlinkedPartDirective extends UnlinkedConfigurableUriDirective {
) {
x.write(sink);
});
sink.writeUInt30(partKeywordOffset);
sink.writeUint30(partKeywordOffset);
sink.writeOptionalStringUtf8(uri);
}
}
@@ -446,14 +446,14 @@ class UnlinkedSourceRange {
factory UnlinkedSourceRange.read(SummaryDataReader reader) {
return UnlinkedSourceRange(
offset: reader.readUInt30(),
length: reader.readUInt30(),
offset: reader.readUint30(),
length: reader.readUint30(),
);
}
void write(BufferedSink sink) {
sink.writeUInt30(offset);
sink.writeUInt30(length);
sink.writeUint30(offset);
sink.writeUint30(length);
}
}
@@ -531,7 +531,7 @@ class UnlinkedUnit {
libraryDirective: reader.readOptionalObject(
() => UnlinkedLibraryDirective.read(reader),
),
lineStarts: reader.readUInt30List(),
lineStarts: reader.readUint30List(),
parts: reader.readTypedList(() => UnlinkedPartDirective.read(reader)),
partOfNameDirective: reader.readOptionalObject(
() => UnlinkedPartOfNameDirective.read(reader),
pkg/analyzer/lib/src/fine/lookup_name.dart
+3 -3
View File
@@ -119,7 +119,7 @@ extension type LookupName(String _it) {
extension BufferedSinkExtension on BufferedSink {
void writeBaseNameIterable(Iterable<BaseName> names) {
writeUInt30(names.length);
writeUint30(names.length);
for (var baseName in names) {
baseName.write(this);
}
@@ -154,7 +154,7 @@ extension StringExtension on String {
extension SummaryDataReaderExtension on SummaryDataReader {
Set<BaseName> readBaseNameSet() {
var length = readUInt30();
var length = readUint30();
var result = <BaseName>{};
for (var i = 0; i < length; i++) {
var baseName = BaseName.read(this);
@@ -168,7 +168,7 @@ extension SummaryDataReaderExtension on SummaryDataReader {
}
Set<LookupName> readLookupNameSet() {
var length = readUInt30();
var length = readUint30();
var result = <LookupName>{};
for (var i = 0; i < length; i++) {
var lookupName = LookupName.read(this);
pkg/analyzer/lib/src/fine/manifest_ast.dart
+2 -2
View File
@@ -118,9 +118,9 @@ class ManifestNode {
return ManifestNode._(
isValid: reader.readBool(),
tokenBuffer: reader.readStringUtf8(),
tokenLengthList: reader.readUInt30List(),
tokenLengthList: reader.readUint30List(),
elements: ManifestElement.readList(reader),
elementIndexList: reader.readUInt30List(),
elementIndexList: reader.readUint30List(),
);
}
pkg/analyzer/lib/src/fine/manifest_id.dart
+3 -3
View File
@@ -35,7 +35,7 @@ class ManifestItemId implements Comparable<ManifestItemId> {
}
factory ManifestItemId.read(SummaryDataReader reader) {
return ManifestItemId._(reader.readUInt32(), reader.readUInt32());
return ManifestItemId._(reader.readUint32(), reader.readUint32());
}
ManifestItemId._(this.hi32, this.lo32)
@@ -61,8 +61,8 @@ class ManifestItemId implements Comparable<ManifestItemId> {
String toString() => '($hi32, $lo32)';
void write(BufferedSink sink) {
sink.writeUInt32(hi32);
sink.writeUInt32(lo32);
sink.writeUint32(hi32);
sink.writeUint32(lo32);
}
static List<ManifestItemId> readList(SummaryDataReader reader) {
pkg/analyzer/lib/src/fine/manifest_item.dart
+23 -23
View File
@@ -1521,7 +1521,7 @@ extension type _ClassItemFlags._(int _bits) implements _InterfaceItemFlags {
}
factory _ClassItemFlags.read(SummaryDataReader reader) {
return _ClassItemFlags._(reader.readUInt30());
return _ClassItemFlags._(reader.readUint30());
}
bool get isAbstract {
@@ -1553,7 +1553,7 @@ extension type _ClassItemFlags._(int _bits) implements _InterfaceItemFlags {
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_ClassItemFlag flag) {
@@ -1583,7 +1583,7 @@ extension type _ConstructorItemFlags._(int _bits)
}
factory _ConstructorItemFlags.read(SummaryDataReader reader) {
return _ConstructorItemFlags._(reader.readUInt30());
return _ConstructorItemFlags._(reader.readUint30());
}
bool get isConst {
@@ -1595,7 +1595,7 @@ extension type _ConstructorItemFlags._(int _bits)
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_ConstructorItemFlag flag) {
@@ -1643,7 +1643,7 @@ extension type _ExecutableItemFlags._(int _bits) implements _ManifestItemFlags {
}
factory _ExecutableItemFlags.read(SummaryDataReader reader) {
return _ExecutableItemFlags._(reader.readUInt30());
return _ExecutableItemFlags._(reader.readUint30());
}
bool get hasEnclosingTypeParameterReference {
@@ -1679,7 +1679,7 @@ extension type _ExecutableItemFlags._(int _bits) implements _ManifestItemFlags {
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_ExecutableItemFlag flag) {
@@ -1709,7 +1709,7 @@ extension type _ExtensionTypeItemFlags._(int _bits)
}
factory _ExtensionTypeItemFlags.read(SummaryDataReader reader) {
return _ExtensionTypeItemFlags._(reader.readUInt30());
return _ExtensionTypeItemFlags._(reader.readUint30());
}
bool get hasImplementsSelfReference {
@@ -1721,7 +1721,7 @@ extension type _ExtensionTypeItemFlags._(int _bits)
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_ExtensionTypeItemFlag flag) {
@@ -1762,7 +1762,7 @@ extension type _FieldItemFlags._(int _bits) implements _VariableItemFlags {
}
factory _FieldItemFlags.read(SummaryDataReader reader) {
return _FieldItemFlags._(reader.readUInt30());
return _FieldItemFlags._(reader.readUint30());
}
bool get hasEnclosingTypeParameterReference {
@@ -1790,7 +1790,7 @@ extension type _FieldItemFlags._(int _bits) implements _VariableItemFlags {
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_FieldItemFlag flag) {
@@ -1817,7 +1817,7 @@ extension type _InstanceItemFlags._(int _bits) implements _ManifestItemFlags {
}
factory _InstanceItemFlags.read(SummaryDataReader reader) {
return _InstanceItemFlags._(reader.readUInt30());
return _InstanceItemFlags._(reader.readUint30());
}
bool get isSimplyBounded {
@@ -1825,7 +1825,7 @@ extension type _InstanceItemFlags._(int _bits) implements _ManifestItemFlags {
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_InstanceItemFlag flag) {
@@ -1849,11 +1849,11 @@ extension type _InterfaceItemFlags._(int _bits) implements _InstanceItemFlags {
}
factory _InterfaceItemFlags.read(SummaryDataReader reader) {
return _InterfaceItemFlags._(reader.readUInt30());
return _InterfaceItemFlags._(reader.readUint30());
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
}
@@ -1870,7 +1870,7 @@ extension type _ManifestItemFlags._(int _bits) {
}
factory _ManifestItemFlags.read(SummaryDataReader reader) {
return _ManifestItemFlags._(reader.readUInt30());
return _ManifestItemFlags._(reader.readUint30());
}
bool get isSynthetic {
@@ -1878,7 +1878,7 @@ extension type _ManifestItemFlags._(int _bits) {
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_ManifestItemFlag flag) {
@@ -1906,7 +1906,7 @@ extension type _MethodItemFlags._(int _bits) implements _ExecutableItemFlags {
}
factory _MethodItemFlags.read(SummaryDataReader reader) {
return _MethodItemFlags._(reader.readUInt30());
return _MethodItemFlags._(reader.readUint30());
}
bool get isOperatorEqualWithParameterTypeFromObject {
@@ -1914,7 +1914,7 @@ extension type _MethodItemFlags._(int _bits) implements _ExecutableItemFlags {
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_MethodItemFlag flag) {
@@ -1940,7 +1940,7 @@ extension type _MixinItemFlags._(int _bits) implements _InterfaceItemFlags {
}
factory _MixinItemFlags.read(SummaryDataReader reader) {
return _MixinItemFlags._(reader.readUInt30());
return _MixinItemFlags._(reader.readUint30());
}
bool get isBase {
@@ -1948,7 +1948,7 @@ extension type _MixinItemFlags._(int _bits) implements _InterfaceItemFlags {
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_MixinItemFlag flag) {
@@ -1977,7 +1977,7 @@ extension type _TopLevelVariableItemFlags._(int _bits)
}
factory _TopLevelVariableItemFlags.read(SummaryDataReader reader) {
return _TopLevelVariableItemFlags._(reader.readUInt30());
return _TopLevelVariableItemFlags._(reader.readUint30());
}
bool get isExternal {
@@ -1985,7 +1985,7 @@ extension type _TopLevelVariableItemFlags._(int _bits)
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_TopLevelVariableItemFlag flag) {
@@ -2058,7 +2058,7 @@ extension type _VariableItemFlags._(int _bits) implements _ManifestItemFlags {
}
void write(BufferedSink sink) {
sink.writeUInt30(_bits);
sink.writeUint30(_bits);
}
bool _has(_VariableItemFlag flag) {
pkg/analyzer/lib/src/fine/manifest_type.dart
+2 -2
View File
@@ -592,7 +592,7 @@ final class ManifestTypeParameterType extends ManifestType {
factory ManifestTypeParameterType.read(SummaryDataReader reader) {
return ManifestTypeParameterType._(
index: reader.readUInt30(),
index: reader.readUint30(),
nullabilitySuffix: reader.readEnum(NullabilitySuffix.values),
);
}
@@ -623,7 +623,7 @@ final class ManifestTypeParameterType extends ManifestType {
@override
void write(BufferedSink sink) {
sink.writeEnum(_ManifestTypeKind.typeParameter);
sink.writeUInt30(index);
sink.writeUint30(index);
sink.writeEnum(nullabilitySuffix);
}
}
pkg/analyzer/lib/src/summary2/ast_binary_reader.dart
+5 -5
View File
@@ -793,7 +793,7 @@ class AstBinaryReader {
IntegerLiteral _readIntegerLiteralNegative() {
var lexeme = _readStringReference();
var value = (_readUInt32() << 32) | _readUInt32();
var value = (_readUint32() << 32) | _readUint32();
return _createIntegerLiteral(lexeme, -value);
}
@@ -816,7 +816,7 @@ class AstBinaryReader {
IntegerLiteral _readIntegerLiteralPositive() {
var lexeme = _readStringReference();
var value = (_readUInt32() << 32) | _readUInt32();
var value = (_readUint32() << 32) | _readUint32();
return _createIntegerLiteral(lexeme, value);
}
@@ -963,7 +963,7 @@ class AstBinaryReader {
}
List<T> _readNodeList<T>() {
var length = _reader.readUInt30();
var length = _reader.readUint30();
return List.generate(length, (_) => readNode() as T);
}
@@ -1366,8 +1366,8 @@ class AstBinaryReader {
);
}
int _readUInt32() {
return _reader.readUInt32();
int _readUint32() {
return _reader.readUint32();
}
VariableDeclaration _readVariableDeclaration() {
pkg/analyzer/lib/src/summary2/ast_binary_writer.dart
+9 -9
View File
@@ -454,8 +454,8 @@ class AstBinaryWriter extends ThrowingAstVisitor<void> {
isPositive ? Tag.IntegerLiteralPositive : Tag.IntegerLiteralNegative,
);
_writeStringReference(node.literal.lexeme);
_writeUInt32(value >> 32);
_writeUInt32(value & 0xFFFFFFFF);
_writeUint32(value >> 32);
_writeUint32(value & 0xFFFFFFFF);
}
}
@@ -813,7 +813,7 @@ class AstBinaryWriter extends ThrowingAstVisitor<void> {
_writeByte(Tag.SymbolLiteral);
var components = node.components;
_writeUInt30(components.length);
_writeUint30(components.length);
for (var token in components) {
_writeStringReference(token.lexeme);
}
@@ -974,7 +974,7 @@ class AstBinaryWriter extends ThrowingAstVisitor<void> {
}
void _writeNodeList(List<AstNode> nodeList) {
_writeUInt30(nodeList.length);
_writeUint30(nodeList.length);
for (var i = 0; i < nodeList.length; ++i) {
nodeList[i].accept(this);
}
@@ -991,16 +991,16 @@ class AstBinaryWriter extends ThrowingAstVisitor<void> {
void _writeStringReference(String string) {
var index = _stringIndexer[string];
_writeUInt30(index);
_writeUint30(index);
}
@pragma("vm:prefer-inline")
void _writeUInt30(int value) {
_sink.writeUInt30(value);
void _writeUint30(int value) {
_sink.writeUint30(value);
}
void _writeUInt32(int value) {
_sink.writeUInt32(value);
void _writeUint32(int value) {
_sink.writeUint32(value);
}
/// Return `true` if the expression might be successfully serialized.
pkg/analyzer/lib/src/summary2/bundle_reader.dart
+32 -32
View File
@@ -49,10 +49,10 @@ class BundleReader {
const bytesOfU32 = 4;
const countOfU32 = 4;
_reader.offset = _reader.bytes.length - bytesOfU32 * countOfU32;
var baseResolutionOffset = _reader.readUInt32();
var librariesOffset = _reader.readUInt32();
var referencesOffset = _reader.readUInt32();
var stringsOffset = _reader.readUInt32();
var baseResolutionOffset = _reader.readUint32();
var librariesOffset = _reader.readUint32();
var referencesOffset = _reader.readUint32();
var stringsOffset = _reader.readUint32();
_reader.createStringTable(stringsOffset);
var referenceReader = _ReferenceReader(
@@ -65,7 +65,7 @@ class BundleReader {
var libraryHeaderList = _reader.readTypedList(() {
return _LibraryHeader(
uri: uriCache.parse(_reader.readStringReference()),
offset: _reader.readUInt30(),
offset: _reader.readUint30(),
);
});
@@ -151,7 +151,7 @@ class LibraryReader {
_readExportedReference,
);
_libraryElement.nameUnion = ElementNameUnion.read(_reader.readUInt30List());
_libraryElement.nameUnion = ElementNameUnion.read(_reader.readUint30List());
_libraryElement.manifest = manifest;
@@ -177,7 +177,7 @@ class LibraryReader {
_libraryElement.setters = _readSetterElements();
_readVariableGetterSetterLinking();
var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
var resolutionOffset = _baseResolutionOffset + _reader.readUint30();
_libraryElement.deferReadResolution(() {
var unitElement = _libraryElement.firstFragment;
var reader = ResolutionReader(
@@ -227,7 +227,7 @@ class LibraryReader {
void Function() _createDeferredReadResolutionCallback(
void Function(ResolutionReader reader) callback,
) {
var offset = _baseResolutionOffset + _reader.readUInt30();
var offset = _baseResolutionOffset + _reader.readUint30();
return () {
var reader = ResolutionReader(
_elementFactory,
@@ -253,7 +253,7 @@ class LibraryReader {
/// - data to read lazily
/// - data to continue reading eagerly
void _lazyRead(void Function(int offset) operation) {
var length = _reader.readUInt30();
var length = _reader.readUint30();
var offset = _reader.offset;
_reader.offset += length;
operation(offset);
@@ -536,11 +536,11 @@ class LibraryReader {
ExportedReference _readExportedReference() {
var kind = _reader.readByte();
if (kind == 0) {
var index = _reader.readUInt30();
var index = _reader.readUint30();
var reference = _referenceReader.referenceOfIndex(index);
return ExportedReferenceDeclared(reference: reference);
} else if (kind == 1) {
var index = _reader.readUInt30();
var index = _reader.readUint30();
var reference = _referenceReader.referenceOfIndex(index);
return ExportedReferenceExported(
reference: reference,
@@ -553,8 +553,8 @@ class LibraryReader {
ExportLocation _readExportLocation() {
return ExportLocation(
fragmentIndex: _reader.readUInt30(),
exportIndex: _reader.readUInt30(),
fragmentIndex: _reader.readUint30(),
exportIndex: _reader.readUint30(),
);
}
@@ -756,7 +756,7 @@ class LibraryReader {
}
int _readFragmentId() {
return _reader.readUInt30();
return _reader.readUint30();
}
String? _readFragmentName() {
@@ -824,14 +824,14 @@ class LibraryReader {
}
LibraryLanguageVersion _readLanguageVersion() {
var packageMajor = _reader.readUInt30();
var packageMinor = _reader.readUInt30();
var packageMajor = _reader.readUint30();
var packageMinor = _reader.readUint30();
var package = Version(packageMajor, packageMinor, 0);
Version? override;
if (_reader.readBool()) {
var overrideMajor = _reader.readUInt30();
var overrideMinor = _reader.readUInt30();
var overrideMajor = _reader.readUint30();
var overrideMinor = _reader.readUint30();
override = Version(overrideMajor, overrideMinor, 0);
}
@@ -1086,7 +1086,7 @@ class LibraryReader {
/// Read the reference of a non-local element.
Reference _readReference() {
var referenceIndex = _reader.readUInt30();
var referenceIndex = _reader.readUint30();
return _referenceReader.referenceOfIndex(referenceIndex);
}
@@ -1150,7 +1150,7 @@ class LibraryReader {
}) {
var id = _readFragmentId();
var name = _readFragmentName();
var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
var resolutionOffset = _baseResolutionOffset + _reader.readUint30();
var fragment = create(name);
idFragmentMap[id] = fragment;
@@ -1346,7 +1346,7 @@ class LibraryReader {
required LibraryFragmentImpl? containerUnit,
required Source unitSource,
}) {
var resolutionOffset = _baseResolutionOffset + _reader.readUInt30();
var resolutionOffset = _baseResolutionOffset + _reader.readUint30();
var unitElement = LibraryFragmentImpl(
library: _libraryElement,
@@ -1518,15 +1518,15 @@ class ResolutionReader {
return SubstitutedFieldElementImpl.from(elementImpl, substitution);
}
case ElementTag.elementImpl:
var referenceIndex = _reader.readUInt30();
var referenceIndex = _reader.readUint30();
var reference = _referenceReader.referenceOfIndex(referenceIndex);
return _elementFactory.elementOfReference3(reference);
case ElementTag.typeParameter:
var index = _reader.readUInt30();
var index = _reader.readUint30();
return _localElements[index] as TypeParameterElementImpl;
case ElementTag.formalParameter:
var enclosing = readElement() as FunctionTypedElementImpl;
var index = _reader.readUInt30();
var index = _reader.readUint30();
return enclosing.formalParameters[index];
}
}
@@ -1588,8 +1588,8 @@ class ResolutionReader {
}
SourceRange readSourceRange() {
var offset = readUInt30();
var length = readUInt30();
var offset = readUint30();
var length = readUint30();
return SourceRange(offset, length);
}
@@ -1660,12 +1660,12 @@ class ResolutionReader {
return _reader.readTypedList(read);
}
int readUInt30() {
return _reader.readUInt30();
int readUint30() {
return _reader.readUint30();
}
int readUInt32() {
return _reader.readUInt32();
int readUint32() {
return _reader.readUint32();
}
void setOffset(int offset) {
@@ -1951,8 +1951,8 @@ class _ReferenceReader {
_ReferenceReader(this.elementFactory, this._reader, int offset) {
_reader.offset = offset;
_parents = _reader.readUInt30List();
_names = _reader.readUInt30List();
_parents = _reader.readUint30List();
_names = _reader.readUint30List();
assert(_parents.length == _names.length);
_references = List.filled(_names.length, null);
pkg/analyzer/lib/src/summary2/bundle_writer.dart
+21 -21
View File
@@ -75,7 +75,7 @@ class BundleWriter {
var librariesOffset = _sink.offset;
_sink.writeList<_Library>(_libraries, (library) {
_sink._writeStringReference(library.uriStr);
_sink.writeUInt30(library.offset);
_sink.writeUint30(library.offset);
});
var referencesOffset = _sink.offset;
@@ -86,10 +86,10 @@ class BundleWriter {
var stringTableOffset = _stringIndexer.write(_sink);
// Write as Uint32 so that we know where it is.
_sink.writeUInt32(baseResolutionOffset);
_sink.writeUInt32(librariesOffset);
_sink.writeUInt32(referencesOffset);
_sink.writeUInt32(stringTableOffset);
_sink.writeUint32(baseResolutionOffset);
_sink.writeUint32(librariesOffset);
_sink.writeUint32(referencesOffset);
_sink.writeUint32(stringTableOffset);
var bytes = _sink.takeBytes();
return BundleWriterResult(resolutionBytes: bytes);
@@ -305,10 +305,10 @@ class BundleWriter {
var index = _references._indexOfReference(exported.reference);
if (exported is ExportedReferenceDeclared) {
_sink.writeByte(0);
_sink.writeUInt30(index);
_sink.writeUint30(index);
} else if (exported is ExportedReferenceExported) {
_sink.writeByte(1);
_sink.writeUInt30(index);
_sink.writeUint30(index);
_sink.writeList(exported.locations, _writeExportLocation);
} else {
throw UnimplementedError('(${exported.runtimeType}) $exported');
@@ -317,8 +317,8 @@ class BundleWriter {
}
void _writeExportLocation(ExportLocation location) {
_sink.writeUInt30(location.fragmentIndex);
_sink.writeUInt30(location.exportIndex);
_sink.writeUint30(location.fragmentIndex);
_sink.writeUint30(location.exportIndex);
}
void _writeExtensionElements(List<ExtensionElementImpl> elements) {
@@ -459,13 +459,13 @@ class BundleWriter {
_sink = savedSink;
var bytes = newSink.takeBytes();
_sink.writeUInt30(bytes.length);
_sink.writeUint30(bytes.length);
_sink.writeBytes(bytes);
}
void _writeFragmentId(FragmentImpl fragment) {
var id = _fragmentIds.getId(fragment);
_sink.writeUInt30(id);
_sink.writeUint30(id);
}
void _writeFragmentName(Fragment fragment) {
@@ -498,14 +498,14 @@ class BundleWriter {
}
void _writeLanguageVersion(LibraryLanguageVersion version) {
_sink.writeUInt30(version.package.major);
_sink.writeUInt30(version.package.minor);
_sink.writeUint30(version.package.major);
_sink.writeUint30(version.package.minor);
var override = version.override;
if (override != null) {
_sink.writeBool(true);
_sink.writeUInt30(override.major);
_sink.writeUInt30(override.minor);
_sink.writeUint30(override.major);
_sink.writeUint30(override.minor);
} else {
_sink.writeBool(false);
}
@@ -667,13 +667,13 @@ class BundleWriter {
void _writeReference(Reference reference) {
var index = _references._indexOfReference(reference);
_sink.writeUInt30(index);
_sink.writeUint30(index);
}
/// Invoke this after writing enough information to create an element, but
/// before writing any resolution data.
void _writeResolutionOffset() {
_sink.writeUInt30(_resolutionSink.offset);
_sink.writeUint30(_resolutionSink.offset);
}
void _writeSetterElements(List<SetterElementImpl> elements) {
@@ -910,7 +910,7 @@ class ResolutionSink extends _SummaryDataWriter {
case TypeParameterElementImpl():
writeEnum(ElementTag.typeParameter);
var localIndex = localElements[element];
writeUInt30(localIndex);
writeUint30(localIndex);
case FormalParameterElementImpl():
writeEnum(ElementTag.formalParameter);
var enclosingElement = element.enclosingElement;
@@ -918,12 +918,12 @@ class ResolutionSink extends _SummaryDataWriter {
writeElement(enclosingElement);
var index = enclosingElement.formalParameters.indexOf(element);
assert(index >= 0);
writeUInt30(index);
writeUint30(index);
case ElementImpl():
writeEnum(ElementTag.elementImpl);
var reference = element.reference!;
var referenceIndex = _references._indexOfReference(reference);
writeUInt30(referenceIndex);
writeUint30(referenceIndex);
default:
throw StateError('${element.runtimeType}');
}
@@ -1321,7 +1321,7 @@ class _SummaryDataWriter extends BufferedSink {
void _writeStringReference(String string) {
var index = _stringIndexer[string];
writeUInt30(index);
writeUint30(index);
}
void _writeTopLevelInferenceError(TopLevelInferenceError? error) {
pkg/analyzer/lib/src/summary2/informative_data.dart
+58 -58
View File
@@ -1290,7 +1290,7 @@ class _InfoClassTypeAlias extends _InfoNode {
_InfoClassTypeAlias.read(super.reader)
: typeParameters = reader.readList(_InfoTypeParameter.read),
constantOffsets = reader.readUInt30List(),
constantOffsets = reader.readUint30List(),
super.read();
@override
@@ -1309,14 +1309,14 @@ class _InfoCombinator {
factory _InfoCombinator.read(SummaryDataReader reader) {
return _InfoCombinator(
offset: reader.readUInt30(),
end: reader.readUInt30(),
offset: reader.readUint30(),
end: reader.readUint30(),
);
}
void write(BufferedSink sink) {
sink.writeUInt30(offset);
sink.writeUInt30(end);
sink.writeUint30(offset);
sink.writeUint30(end);
}
}
@@ -1340,16 +1340,16 @@ class _InfoConstructorDeclaration extends _InfoExecutableDeclaration {
});
_InfoConstructorDeclaration.read(super.reader)
: typeNameOffset = reader.readUInt30(),
periodOffset = reader.readOptionalUInt30(),
nameEnd = reader.readOptionalUInt30(),
: typeNameOffset = reader.readUint30(),
periodOffset = reader.readOptionalUint30(),
nameEnd = reader.readOptionalUint30(),
super.read();
@override
void write(BufferedSink sink) {
sink.writeUInt30(typeNameOffset);
sink.writeOptionalUInt30(periodOffset);
sink.writeOptionalUInt30(nameEnd);
sink.writeUint30(typeNameOffset);
sink.writeOptionalUint30(periodOffset);
sink.writeOptionalUint30(nameEnd);
super.write(sink);
}
}
@@ -1379,7 +1379,7 @@ class _InfoExecutableDeclaration extends _InfoNode {
_InfoExecutableDeclaration.read(super.reader)
: typeParameters = reader.readList(_InfoTypeParameter.read),
parameters = reader.readList(_InfoFormalParameter.read),
constantOffsets = reader.readUInt30List(),
constantOffsets = reader.readUint30List(),
super.read();
@override
@@ -1399,13 +1399,13 @@ class _InfoExport {
factory _InfoExport.read(SummaryDataReader reader) {
return _InfoExport(
exportKeywordOffset: reader.readUInt30(),
exportKeywordOffset: reader.readUint30(),
combinators: reader.readList(_InfoCombinator.read),
);
}
void write(BufferedSink sink) {
sink.writeUInt30(exportKeywordOffset);
sink.writeUint30(exportKeywordOffset);
sink.writeList(combinators, (v) => v.write(sink));
}
}
@@ -1458,25 +1458,25 @@ class _InfoExtensionTypeRepresentation {
factory _InfoExtensionTypeRepresentation.read(SummaryDataReader reader) {
return _InfoExtensionTypeRepresentation(
firstTokenOffset: reader.readUInt30(),
codeOffset: reader.readUInt30(),
codeLength: reader.readUInt30(),
constructorPeriodOffset: reader.readOptionalUInt30(),
constructorNameOffset: reader.readOptionalUInt30(),
constructorNameEnd: reader.readOptionalUInt30(),
fieldNameOffset: reader.readOptionalUInt30(),
fieldConstantOffsets: reader.readUInt30List(),
firstTokenOffset: reader.readUint30(),
codeOffset: reader.readUint30(),
codeLength: reader.readUint30(),
constructorPeriodOffset: reader.readOptionalUint30(),
constructorNameOffset: reader.readOptionalUint30(),
constructorNameEnd: reader.readOptionalUint30(),
fieldNameOffset: reader.readOptionalUint30(),
fieldConstantOffsets: reader.readUint30List(),
);
}
void write(BufferedSink sink) {
sink.writeUInt30(firstTokenOffset);
sink.writeUInt30(codeOffset);
sink.writeUInt30(codeLength);
sink.writeOptionalUInt30(constructorPeriodOffset);
sink.writeOptionalUInt30(constructorNameOffset);
sink.writeOptionalUInt30(constructorNameEnd);
sink.writeOptionalUInt30(fieldNameOffset);
sink.writeUint30(firstTokenOffset);
sink.writeUint30(codeOffset);
sink.writeUint30(codeLength);
sink.writeOptionalUint30(constructorPeriodOffset);
sink.writeOptionalUint30(constructorNameOffset);
sink.writeOptionalUint30(constructorNameEnd);
sink.writeOptionalUint30(fieldNameOffset);
sink.writeUint30List(fieldConstantOffsets);
}
}
@@ -1494,7 +1494,7 @@ class _InfoFieldDeclaration extends _InfoNode {
}) : super();
_InfoFieldDeclaration.read(super.reader)
: constantOffsets = reader.readUInt30List(),
: constantOffsets = reader.readUint30List(),
super.read();
@override
@@ -1549,7 +1549,7 @@ class _InfoFunctionTypeAlias extends _InfoNode {
_InfoFunctionTypeAlias.read(super.reader)
: typeParameters = reader.readList(_InfoTypeParameter.read),
parameters = reader.readList(_InfoFormalParameter.read),
constantOffsets = reader.readUInt30List(),
constantOffsets = reader.readUint30List(),
super.read();
@override
@@ -1583,7 +1583,7 @@ class _InfoGenericTypeAlias extends _InfoNode {
: typeParameters = reader.readList(_InfoTypeParameter.read),
aliasedTypeParameters = reader.readList(_InfoTypeParameter.read),
aliasedFormalParameters = reader.readList(_InfoFormalParameter.read),
constantOffsets = reader.readUInt30List(),
constantOffsets = reader.readUint30List(),
super.read();
@override
@@ -1609,15 +1609,15 @@ class _InfoImport {
factory _InfoImport.read(SummaryDataReader reader) {
return _InfoImport(
importKeywordOffset: reader.readUInt30(),
prefixOffset: reader.readOptionalUInt30(),
importKeywordOffset: reader.readUint30(),
prefixOffset: reader.readOptionalUint30(),
combinators: reader.readList(_InfoCombinator.read),
);
}
void write(BufferedSink sink) {
sink.writeUInt30(importKeywordOffset);
sink.writeOptionalUInt30(prefixOffset);
sink.writeUint30(importKeywordOffset);
sink.writeOptionalUint30(prefixOffset);
sink.writeList(combinators, (v) => v.write(sink));
}
}
@@ -1651,7 +1651,7 @@ abstract class _InfoInstanceDeclaration extends _InfoNode {
getters = reader.readList(_InfoExecutableDeclaration.read),
setters = reader.readList(_InfoExecutableDeclaration.read),
methods = reader.readList(_InfoExecutableDeclaration.read),
constantOffsets = reader.readUInt30List(),
constantOffsets = reader.readUint30List(),
super.read();
@override
@@ -1692,14 +1692,14 @@ class _InfoLibraryName {
factory _InfoLibraryName.read(SummaryDataReader reader) {
return _InfoLibraryName(
offset: reader.readUInt30() - 1,
length: reader.readUInt30(),
offset: reader.readUint30() - 1,
length: reader.readUint30(),
);
}
void write(BufferedSink sink) {
sink.writeUInt30(offset + 1);
sink.writeUInt30(length);
sink.writeUint30(offset + 1);
sink.writeUint30(length);
}
}
@@ -1725,17 +1725,17 @@ abstract class _InfoNode {
});
_InfoNode.read(SummaryDataReader reader)
: firstTokenOffset = reader.readUInt30(),
codeOffset = reader.readUInt30(),
codeLength = reader.readUInt30(),
nameOffset = reader.readOptionalUInt30(),
: firstTokenOffset = reader.readUint30(),
codeOffset = reader.readUint30(),
codeLength = reader.readUint30(),
nameOffset = reader.readOptionalUint30(),
documentationComment = reader.readStringUtf8().nullIfEmpty;
void write(BufferedSink sink) {
sink.writeUInt30(firstTokenOffset);
sink.writeUInt30(codeOffset);
sink.writeUInt30(codeLength);
sink.writeOptionalUInt30(nameOffset);
sink.writeUint30(firstTokenOffset);
sink.writeUint30(codeOffset);
sink.writeUint30(codeLength);
sink.writeOptionalUint30(nameOffset);
sink.writeStringUtf8(documentationComment ?? '');
}
}
@@ -1746,11 +1746,11 @@ class _InfoPart {
_InfoPart({required this.partKeywordOffset});
factory _InfoPart.read(SummaryDataReader reader) {
return _InfoPart(partKeywordOffset: reader.readUInt30());
return _InfoPart(partKeywordOffset: reader.readUint30());
}
void write(BufferedSink sink) {
sink.writeUInt30(partKeywordOffset);
sink.writeUint30(partKeywordOffset);
}
}
@@ -1767,7 +1767,7 @@ class _InfoTopLevelVariable extends _InfoNode {
}) : super();
_InfoTopLevelVariable.read(super.reader)
: constantOffsets = reader.readUInt30List(),
: constantOffsets = reader.readUint30List(),
super.read();
@override
@@ -1836,11 +1836,11 @@ class _InfoUnit {
});
_InfoUnit.read(SummaryDataReader reader)
: codeOffset = reader.readUInt30(),
codeLength = reader.readUInt30(),
lineStarts = reader.readUInt30List(),
: codeOffset = reader.readUint30(),
codeLength = reader.readUint30(),
lineStarts = reader.readUint30List(),
libraryName = _InfoLibraryName.read(reader),
libraryConstantOffsets = reader.readUInt30List(),
libraryConstantOffsets = reader.readUint30List(),
docComment = reader.readOptionalStringUtf8(),
imports = reader.readList(_InfoImport.read),
exports = reader.readList(_InfoExport.read),
@@ -1859,8 +1859,8 @@ class _InfoUnit {
topLevelVariable = reader.readList(_InfoTopLevelVariable.read);
void write(BufferedSink sink) {
sink.writeUInt30(codeOffset);
sink.writeUInt30(codeLength);
sink.writeUint30(codeOffset);
sink.writeUint30(codeLength);
sink.writeUint30List(lineStarts);
libraryName.write(sink);
sink.writeUint30List(libraryConstantOffsets);
pkg/analyzer/lib/src/summary2/package_bundle_format.dart
+6 -6
View File
@@ -68,10 +68,10 @@ class PackageBundleReader {
_sdk = PackageBundleSdk._fromReader(reader);
}
var librariesLength = reader.readUInt30();
var librariesLength = reader.readUint30();
for (var i = 0; i < librariesLength; i++) {
var uriStr = reader.readStringUtf8();
var unitsLength = reader.readUInt30();
var unitsLength = reader.readUint30();
var units = List.generate(unitsLength, (_) {
var uriStr = reader.readStringUtf8();
return PackageBundleUnit(uriStr);
@@ -102,15 +102,15 @@ class PackageBundleSdk {
factory PackageBundleSdk._fromReader(SummaryDataReader reader) {
return PackageBundleSdk(
languageVersionMajor: reader.readUInt30(),
languageVersionMinor: reader.readUInt30(),
languageVersionMajor: reader.readUint30(),
languageVersionMinor: reader.readUint30(),
allowedExperimentsJson: reader.readStringUtf8(),
);
}
void _write(BufferedSink sink) {
sink.writeUInt30(languageVersionMajor);
sink.writeUInt30(languageVersionMinor);
sink.writeUint30(languageVersionMajor);
sink.writeUint30(languageVersionMinor);
sink.writeStringUtf8(allowedExperimentsJson);
}
}