Skip to content

Commit 644df9b

Browse files
johnniwinthercommit-bot@chromium.org
johnniwinther
authored and
[email protected]
committed
Revert "Reland: [kernel] Rename Name.name to Name.text"
This reverts commit c430a0a. Reason for revert: Will break flutter_frontend_server when rolled into google3 Original change's description: > Reland: [kernel] Rename Name.name to Name.text > > Change-Id: I5240b0ff09faf35184998920202d7600dc97766d > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/162746 > Reviewed-by: Johnni Winther <[email protected]> > Commit-Queue: Johnni Winther <[email protected]> [email protected],[email protected] Change-Id: Ib6961f49dd416171c5d5935c490d79d6f7be779e No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/162748 Reviewed-by: Johnni Winther <[email protected]> Commit-Queue: Johnni Winther <[email protected]>
1 parent c430a0a commit 644df9b

File tree

95 files changed

+483
-483
lines changed

Some content is hidden

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

95 files changed

+483
-483
lines changed

‎pkg/_js_interop_checks/lib/js_interop_checks.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ class JsInteropChecks extends RecursiveVisitor<void> {
3535
if (!procedure.isExternal || !isJSInteropMember(procedure)) return;
3636

3737
if (!procedure.isStatic &&
38-
(procedure.name.text == '[]=' || procedure.name.text == '[]')) {
38+
(procedure.name.name == '[]=' || procedure.name.name == '[]')) {
3939
_diagnosticsReporter.report(
4040
messageJsInteropIndexNotSupported,
4141
procedure.fileOffset,
42-
procedure.name.text.length,
42+
procedure.name.name.length,
4343
procedure.location.file);
4444
}
4545

@@ -73,7 +73,7 @@ class JsInteropChecks extends RecursiveVisitor<void> {
7373
_diagnosticsReporter.report(
7474
messageJsInteropNonExternalConstructor,
7575
constructor.fileOffset,
76-
constructor.name.text.length,
76+
constructor.name.name.length,
7777
constructor.location.file);
7878
}
7979

@@ -99,7 +99,7 @@ class JsInteropChecks extends RecursiveVisitor<void> {
9999
var enclosingClass = m.enclosingClass;
100100
if (enclosingClass != null && !hasJSInteropAnnotation(enclosingClass)) {
101101
_diagnosticsReporter.report(messageJsInteropEnclosingClassJSAnnotation,
102-
m.fileOffset, m.name.text.length, m.location.file,
102+
m.fileOffset, m.name.name.length, m.location.file,
103103
context: <LocatedMessage>[
104104
messageJsInteropEnclosingClassJSAnnotationContext.withLocation(
105105
enclosingClass.location.file,

‎pkg/compiler/lib/src/io/kernel_source_information.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ String _findExtensionMemberName(ir.Member member) {
9393
} else {
9494
extensionName = extension.name;
9595
}
96-
String memberName = descriptor.name.text;
96+
String memberName = descriptor.name.name;
9797
return '$extensionName.$memberName';
9898
}
9999
}

‎pkg/compiler/lib/src/ir/annotations.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class IrAnnotationData {
7777
_jsInteropLibraryNames.forEach((ir.Library library, _) {
7878
for (ir.Member member in library.members) {
7979
if (member.isExternal) {
80-
f(member, _jsInteropMemberNames[member] ?? member.name.text);
80+
f(member, _jsInteropMemberNames[member] ?? member.name.name);
8181
}
8282
}
8383
});
@@ -86,7 +86,7 @@ class IrAnnotationData {
8686
if (member is ir.Field) continue;
8787
String name = _jsInteropMemberNames[member];
8888
if (member.isExternal) {
89-
name ??= member.name.text;
89+
name ??= member.name.name;
9090
}
9191
f(member, name);
9292
}
@@ -99,7 +99,7 @@ class IrAnnotationData {
9999
f) {
100100
for (ir.Member node in _nativeMembers) {
101101
if (node is! ir.Field) {
102-
String name = _nativeMemberNames[node] ?? node.name.text;
102+
String name = _nativeMemberNames[node] ?? node.name.name;
103103
f(node, name, getCreatesAnnotations(node), getReturnsAnnotations(node));
104104
}
105105
}
@@ -112,7 +112,7 @@ class IrAnnotationData {
112112
for (ir.Class cls in _nativeClassNames.keys) {
113113
for (ir.Field field in cls.fields) {
114114
if (field.isInstanceMember) {
115-
String name = _nativeMemberNames[field] ?? field.name.text;
115+
String name = _nativeMemberNames[field] ?? field.name.name;
116116
f(field, name, getCreatesAnnotations(field),
117117
getReturnsAnnotations(field));
118118
}
@@ -348,9 +348,9 @@ PragmaAnnotationData _getPragmaAnnotation(ir.Constant constant) {
348348
ir.Constant optionsValue;
349349
value.fieldValues.forEach((ir.Reference reference, ir.Constant fieldValue) {
350350
ir.Field field = reference.asField;
351-
if (field.name.text == 'name') {
351+
if (field.name.name == 'name') {
352352
nameValue = fieldValue;
353-
} else if (field.name.text == 'options') {
353+
} else if (field.name.name == 'options') {
354354
optionsValue = fieldValue;
355355
}
356356
});

‎pkg/compiler/lib/src/ir/debug.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class DebugPrinter extends Visitor with Indentation, Tagging<Node> {
2929
@override
3030
void visitName(Name node) {
3131
openAndCloseNode(node, '${node.runtimeType}',
32-
{'name': node.text, 'library': node.library?.name});
32+
{'name': node.name, 'library': node.library?.name});
3333
}
3434

3535
@override

‎pkg/compiler/lib/src/ir/impact.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ abstract class ImpactBuilderBase extends StaticTypeVisitor
542542
positionArguments, namedArguments, typeArguments);
543543
// TODO(johnniwinther): Avoid treating a known function call as a
544544
// dynamic call when CFE provides a way to distinguish the two.
545-
if (operatorFromString(node.name.text) == null &&
545+
if (operatorFromString(node.name.name) == null &&
546546
receiverType is ir.DynamicType) {
547547
// We might implicitly call a getter that returns a function.
548548
registerFunctionInvocation(const ir.DynamicType(), positionArguments,

‎pkg/compiler/lib/src/ir/runtime_type_analysis.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RuntimeTypeUseData computeRuntimeTypeUse(
8484

8585
/// Returns `true` if [node] is of the form `e.runtimeType`.
8686
bool isGetRuntimeType(ir.TreeNode node) {
87-
return node is ir.PropertyGet && node.name.text == Identifiers.runtimeType_;
87+
return node is ir.PropertyGet && node.name.name == Identifiers.runtimeType_;
8888
}
8989

9090
/// Returns [node] if [node] is of the form `e.runtimeType` and `null`
@@ -95,7 +95,7 @@ RuntimeTypeUseData computeRuntimeTypeUse(
9595

9696
/// Returns `true` if [node] is of the form `e.toString()`.
9797
bool isInvokeToString(ir.TreeNode node) {
98-
return node is ir.MethodInvocation && node.name.text == 'toString';
98+
return node is ir.MethodInvocation && node.name.name == 'toString';
9999
}
100100

101101
assert(isGetRuntimeType(node));
@@ -141,7 +141,7 @@ RuntimeTypeUseData computeRuntimeTypeUse(
141141
} else if (nullAware.parent is ir.MethodInvocation) {
142142
ir.MethodInvocation methodInvocation = nullAware.parent;
143143
if (methodInvocation.receiver == nullAware.let &&
144-
methodInvocation.name.text == '==') {
144+
methodInvocation.name.name == '==') {
145145
// Detected
146146
//
147147
// e0?.runtimeType == other
@@ -202,7 +202,7 @@ RuntimeTypeUseData computeRuntimeTypeUse(
202202
} else if (nullAware.parent is ir.Arguments &&
203203
nullAware.parent.parent is ir.MethodInvocation) {
204204
ir.MethodInvocation methodInvocation = nullAware.parent.parent;
205-
if (methodInvocation.name.text == '==' &&
205+
if (methodInvocation.name.name == '==' &&
206206
methodInvocation.arguments.positional.first == nullAware.let) {
207207
// [nullAware] is the right hand side of ==.
208208

@@ -290,7 +290,7 @@ RuntimeTypeUseData computeRuntimeTypeUse(
290290
}
291291
} else if (node.parent is ir.MethodInvocation) {
292292
ir.MethodInvocation methodInvocation = node.parent;
293-
if (methodInvocation.name.text == '==' &&
293+
if (methodInvocation.name.name == '==' &&
294294
methodInvocation.receiver == node) {
295295
// [node] is the left hand side of ==.
296296

@@ -340,7 +340,7 @@ RuntimeTypeUseData computeRuntimeTypeUse(
340340
} else if (node.parent is ir.Arguments &&
341341
node.parent.parent is ir.MethodInvocation) {
342342
ir.MethodInvocation methodInvocation = node.parent.parent;
343-
if (methodInvocation.name.text == '==' &&
343+
if (methodInvocation.name.name == '==' &&
344344
methodInvocation.arguments.positional.first == node) {
345345
// [node] is the right hand side of ==.
346346
ir.PropertyGet otherGetRuntimeType =

‎pkg/compiler/lib/src/ir/scope_visitor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ class InitializerComplexity {
12281228
sb.write('eager');
12291229
if (fields != null) {
12301230
sb.write('&fields=[');
1231-
List<String> names = fields.map((f) => f.name.text).toList()..sort();
1231+
List<String> names = fields.map((f) => f.name.name).toList()..sort();
12321232
sb.write(names.join(','));
12331233
sb.write(']');
12341234
}

‎pkg/compiler/lib/src/ir/static_type.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ abstract class StaticTypeVisitor extends StaticTypeBase {
233233
.substituteType(interfaceTarget.getterType);
234234
}
235235
// Treat the properties of Object specially.
236-
String nameString = node.name.text;
236+
String nameString = node.name.name;
237237
if (nameString == 'hashCode') {
238238
return typeEnvironment.coreTypes.intNonNullableRawType;
239239
} else if (nameString == 'runtimeType') {
@@ -255,7 +255,7 @@ abstract class StaticTypeVisitor extends StaticTypeBase {
255255
_computePropertyGetType(node, receiverType);
256256
receiverType = _narrowInstanceReceiver(node.interfaceTarget, receiverType);
257257
handlePropertyGet(node, receiverType, resultType);
258-
if (node.name.text == Identifiers.runtimeType_) {
258+
if (node.name.name == Identifiers.runtimeType_) {
259259
RuntimeTypeUseData data =
260260
computeRuntimeTypeUse(_pendingRuntimeTypeUseData, node);
261261
if (data.leftRuntimeTypeExpression == node) {
@@ -391,7 +391,7 @@ abstract class StaticTypeVisitor extends StaticTypeBase {
391391

392392
ir.Member _getMember(ir.Class cls, String name) {
393393
for (ir.Member member in cls.members) {
394-
if (member.name.text == name) return member;
394+
if (member.name.name == name) return member;
395395
}
396396
throw fail("Member '$name' not found in $cls");
397397
}
@@ -599,7 +599,7 @@ abstract class StaticTypeVisitor extends StaticTypeBase {
599599
// TODO(34602): Remove when `interfaceTarget` is set on synthetic calls to
600600
// ==.
601601
if (interfaceTarget == null &&
602-
node.name.text == '==' &&
602+
node.name.name == '==' &&
603603
node.arguments.types.isEmpty &&
604604
node.arguments.positional.length == 1 &&
605605
node.arguments.named.isEmpty) {
@@ -647,7 +647,7 @@ abstract class StaticTypeVisitor extends StaticTypeBase {
647647
return const ir.DynamicType();
648648
}
649649
}
650-
if (node.name.text == 'call') {
650+
if (node.name.name == 'call') {
651651
if (receiverType is ir.FunctionType) {
652652
if (receiverType.typeParameters.length != node.arguments.types.length) {
653653
return const DoesNotCompleteType();
@@ -657,7 +657,7 @@ abstract class StaticTypeVisitor extends StaticTypeBase {
657657
.substituteType(receiverType.returnType);
658658
}
659659
}
660-
if (node.name.text == '==') {
660+
if (node.name.name == '==') {
661661
// We use this special case to simplify generation of '==' checks.
662662
return typeEnvironment.coreTypes.boolNonNullableRawType;
663663
}
@@ -701,7 +701,7 @@ abstract class StaticTypeVisitor extends StaticTypeBase {
701701
ir.DartType returnType =
702702
_computeMethodInvocationType(node, receiverType, argumentTypes);
703703
receiverType = _narrowInstanceReceiver(node.interfaceTarget, receiverType);
704-
if (node.name.text == '==') {
704+
if (node.name.name == '==') {
705705
ir.Expression left = node.receiver;
706706
ir.Expression right = node.arguments.positional[0];
707707
TypeMap afterInvocation = typeMap;

‎pkg/compiler/lib/src/ir/util.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ NullAwareExpression getNullAwareExpression(ir.TreeNode node) {
120120
body.then is ir.NullLiteral) {
121121
ir.MethodInvocation invocation = body.condition;
122122
ir.Expression receiver = invocation.receiver;
123-
if (invocation.name.text == '==' &&
123+
if (invocation.name.name == '==' &&
124124
receiver is ir.VariableGet &&
125125
receiver.variable == node.variable &&
126126
invocation.arguments.positional.single is ir.NullLiteral) {

‎pkg/compiler/lib/src/js_model/element_map_impl.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ class JsKernelToElementMap implements JsToElementMap, IrToElementMap {
820820
while (superclass != null) {
821821
JClassEnv env = classes.getEnv(superclass);
822822
MemberEntity superMember =
823-
env.lookupMember(this, name.text, setter: setter);
823+
env.lookupMember(this, name.name, setter: setter);
824824
if (superMember != null) {
825825
if (!superMember.isInstanceMember) return null;
826826
if (!superMember.isAbstract) {
@@ -1243,7 +1243,7 @@ class JsKernelToElementMap implements JsToElementMap, IrToElementMap {
12431243
@override
12441244
Name getName(ir.Name name) {
12451245
return new Name(
1246-
name.text, name.isPrivate ? getLibrary(name.library) : null);
1246+
name.name, name.isPrivate ? getLibrary(name.library) : null);
12471247
}
12481248

12491249
@override
@@ -1302,13 +1302,13 @@ class JsKernelToElementMap implements JsToElementMap, IrToElementMap {
13021302

13031303
Selector getGetterSelector(ir.Name irName) {
13041304
Name name = new Name(
1305-
irName.text, irName.isPrivate ? getLibrary(irName.library) : null);
1305+
irName.name, irName.isPrivate ? getLibrary(irName.library) : null);
13061306
return new Selector.getter(name);
13071307
}
13081308

13091309
Selector getSetterSelector(ir.Name irName) {
13101310
Name name = new Name(
1311-
irName.text, irName.isPrivate ? getLibrary(irName.library) : null);
1311+
irName.name, irName.isPrivate ? getLibrary(irName.library) : null);
13121312
return new Selector.setter(name);
13131313
}
13141314

@@ -2140,7 +2140,7 @@ class JsKernelToElementMap implements JsToElementMap, IrToElementMap {
21402140
if (node.kind == ir.ProcedureKind.Factory) {
21412141
parts.add(utils.reconstructConstructorName(getMember(node)));
21422142
} else {
2143-
parts.add(utils.operatorNameToIdentifier(node.name.text));
2143+
parts.add(utils.operatorNameToIdentifier(node.name.name));
21442144
}
21452145
} else if (node is ir.Constructor) {
21462146
parts.add(utils.reconstructConstructorName(getMember(node)));

‎pkg/compiler/lib/src/kernel/deferred_load.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class KernelDeferredLoadTask extends DeferredLoadTask {
5353
ir.Member node = _elementMap.getMemberNode(element);
5454
return _findImportsTo(
5555
node is ir.Constructor ? node.enclosingClass : node,
56-
node is ir.Constructor ? node.enclosingClass.name : node.name.text,
56+
node is ir.Constructor ? node.enclosingClass.name : node.name.name,
5757
node.enclosingLibrary,
5858
library);
5959
}

‎pkg/compiler/lib/src/kernel/element_map_impl.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ class KernelToElementMapImpl implements KernelToElementMap, IrToElementMap {
439439
while (superclass != null) {
440440
KClassEnv env = classes.getEnv(superclass);
441441
MemberEntity superMember =
442-
env.lookupMember(this, name.text, setter: setter);
442+
env.lookupMember(this, name.name, setter: setter);
443443
if (superMember != null) {
444444
if (!superMember.isInstanceMember) return null;
445445
if (!superMember.isAbstract) {
@@ -826,7 +826,7 @@ class KernelToElementMapImpl implements KernelToElementMap, IrToElementMap {
826826
@override
827827
Name getName(ir.Name name) {
828828
return new Name(
829-
name.text, name.isPrivate ? getLibrary(name.library) : null);
829+
name.name, name.isPrivate ? getLibrary(name.library) : null);
830830
}
831831

832832
@override
@@ -887,13 +887,13 @@ class KernelToElementMapImpl implements KernelToElementMap, IrToElementMap {
887887

888888
Selector getGetterSelector(ir.Name irName) {
889889
Name name = new Name(
890-
irName.text, irName.isPrivate ? getLibrary(irName.library) : null);
890+
irName.name, irName.isPrivate ? getLibrary(irName.library) : null);
891891
return new Selector.getter(name);
892892
}
893893

894894
Selector getSetterSelector(ir.Name irName) {
895895
Name name = new Name(
896-
irName.text, irName.isPrivate ? getLibrary(irName.library) : null);
896+
irName.name, irName.isPrivate ? getLibrary(irName.library) : null);
897897
return new Selector.setter(name);
898898
}
899899

@@ -1534,7 +1534,7 @@ class KernelToElementMapImpl implements KernelToElementMap, IrToElementMap {
15341534
@override
15351535
ForeignKind getForeignKind(ir.StaticInvocation node) {
15361536
if (commonElements.isForeignHelper(getMember(node.target))) {
1537-
switch (node.target.name.text) {
1537+
switch (node.target.name.name) {
15381538
case Identifiers.JS:
15391539
return ForeignKind.JS;
15401540
case Identifiers.JS_BUILTIN:
@@ -2037,7 +2037,7 @@ class KernelNativeMemberResolver implements NativeMemberResolver {
20372037
/// defaulting to the Dart name.
20382038
void _setNativeName(ir.Member node, IrAnnotationData annotationData) {
20392039
String name = _findJsNameFromAnnotation(node, annotationData);
2040-
name ??= node.name.text;
2040+
name ??= node.name.name;
20412041
_nativeDataBuilder.setNativeMemberName(_elementMap.getMember(node), name);
20422042
}
20432043

@@ -2052,7 +2052,7 @@ class KernelNativeMemberResolver implements NativeMemberResolver {
20522052
void _setNativeNameForStaticMethod(
20532053
ir.Member node, IrAnnotationData annotationData) {
20542054
String name = _findJsNameFromAnnotation(node, annotationData);
2055-
name ??= node.name.text;
2055+
name ??= node.name.name;
20562056
if (_isIdentifier(name)) {
20572057
ClassEntity cls = _elementMap.getClass(node.enclosingClass);
20582058
List<String> nativeNames = _nativeBasicData.getNativeTagsOfClass(cls);

0 commit comments

Comments
 (0)