Skip to content

Commit 7aeda01

Browse files
jensjohaCommit Queue
authored and
Commit Queue
committed
[parser] Follow-up on feedback posted after land of record commit
Follow-up to https://dart-review.googlesource.com/c/sdk/+/262605 Change-Id: I5178f7118af30eaa280dde746ddbf579fff5df40 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/263127 Reviewed-by: Johnni Winther <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Jens Johansen <[email protected]>
1 parent c4ea2d9 commit 7aeda01

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ class Parser {
600600
_isIdentifierOrQuestionIdentifier(endParen.next!)) {
601601
// Looks like a typedef with a record.
602602
TypeInfo typeInfo = computeType(keyword, /* required = */ false);
603-
if (typeInfo is ComplexTypeInfo && typeInfo.recordType) {
603+
if (typeInfo is ComplexTypeInfo && typeInfo.isRecordType) {
604604
typedefWithRecord = true;
605605
}
606606
}
@@ -1423,7 +1423,7 @@ class Parser {
14231423
/// ( ',' recordTypeNamedField )* ','? '}'
14241424
/// recordTypeNamedField ::= metadata type identifier
14251425
Token parseRecordType(
1426-
final Token start, Token token, bool questionMarkPartOfType) {
1426+
final Token start, Token token, bool isQuestionMarkPartOfType) {
14271427
token = token.next!;
14281428
assert(optional('(', token));
14291429

@@ -1503,7 +1503,7 @@ class Parser {
15031503

15041504
// Only consume the `?` if it is part of the type.
15051505
Token? questionMark = token.next!;
1506-
if (optional('?', questionMark) && questionMarkPartOfType) {
1506+
if (optional('?', questionMark) && isQuestionMarkPartOfType) {
15071507
token = questionMark;
15081508
} else {
15091509
questionMark = null;

pkg/_fe_analyzer_shared/lib/src/parser/type_info.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ TypeParamOrArgInfo computeTypeParamOrArg(Token token,
405405
if (isPossibleRecordType(next)) {
406406
TypeInfo type = computeType(beginGroup, /* required = */ false);
407407
if (type is ComplexTypeInfo &&
408-
(type.recordType || type.gftReturnTypeHasRecordType) &&
408+
(type.isRecordType || type.gftReturnTypeHasRecordType) &&
409409
!type.recovered) {
410410
// Looks like a record type.
411411
recordType = true;

pkg/_fe_analyzer_shared/lib/src/parser/type_info_impl.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ class ComplexTypeInfo implements TypeInfo {
510510
bool? gftHasReturnType;
511511

512512
/// If the type is a record type.
513-
bool recordType = false;
513+
bool isRecordType = false;
514514

515515
/// If this is a generalized function type with a record type included in the
516516
/// return type. E.g. `(int, int) Function(bool) Function(int)`.
@@ -532,7 +532,7 @@ class ComplexTypeInfo implements TypeInfo {
532532
this.end,
533533
this.typeVariableStarters,
534534
this.gftHasReturnType,
535-
this.recordType,
535+
this.isRecordType,
536536
this.gftReturnTypeHasRecordType,
537537
this.recovered);
538538

@@ -546,7 +546,7 @@ class ComplexTypeInfo implements TypeInfo {
546546
beforeQuestionMark,
547547
typeVariableStarters,
548548
gftHasReturnType,
549-
recordType,
549+
isRecordType,
550550
gftReturnTypeHasRecordType,
551551
recovered);
552552
}
@@ -599,12 +599,12 @@ class ComplexTypeInfo implements TypeInfo {
599599
// Push the non-existing return type first. The loop below will
600600
// generate the full type.
601601
noType.parseType(token, parser);
602-
} else if (recordType) {
602+
} else if (isRecordType) {
603603
token = parser.parseRecordType(start, token,
604-
/* questionMarkPartOfType = */ beforeQuestionMark != null);
604+
/* isQuestionMarkPartOfType = */ beforeQuestionMark != null);
605605
} else if (gftReturnTypeHasRecordType) {
606606
token = parser.parseRecordType(
607-
start, token, /* questionMarkPartOfType = */ true);
607+
start, token, /* isQuestionMarkPartOfType = */ true);
608608
} else {
609609
Token typeRefOrPrefix = token.next!;
610610
if (optional('void', typeRefOrPrefix)) {
@@ -794,7 +794,7 @@ class ComplexTypeInfo implements TypeInfo {
794794
token = token.next!;
795795
}
796796

797-
recordType = true;
797+
isRecordType = true;
798798

799799
assert(end != null);
800800
return this;

pkg/front_end/test/parser_test_parser.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -439,11 +439,11 @@ class TestParser extends Parser {
439439

440440
@override
441441
Token parseRecordType(
442-
final Token start, Token token, bool questionMarkPartOfType) {
442+
final Token start, Token token, bool isQuestionMarkPartOfType) {
443443
doPrint(
444-
'parseRecordType(' '$start, ' '$token, ' '$questionMarkPartOfType)');
444+
'parseRecordType(' '$start, ' '$token, ' '$isQuestionMarkPartOfType)');
445445
indent++;
446-
var result = super.parseRecordType(start, token, questionMarkPartOfType);
446+
var result = super.parseRecordType(start, token, isQuestionMarkPartOfType);
447447
indent--;
448448
return result;
449449
}

0 commit comments

Comments
 (0)