Skip to content

Commit 236c8da

Browse files
danrubelcommit-bot@chromium.org
danrubel
authored andcommitted
Remove unnecessary typeContinuation variable
Change-Id: I1a78007491598b3a2d17091e96519182bd921f8d Reviewed-on: https://dart-review.googlesource.com/46569 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Dan Rubel <[email protected]>
1 parent a0295ff commit 236c8da

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

pkg/front_end/lib/src/fasta/parser/modifier_context.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,9 @@ class ModifierRecoveryContext2 {
278278
}
279279

280280
/// Parse modifiers for variable declarations.
281-
Token parseVariableDeclarationModifiers(
282-
Token token, TypeContinuation typeContinuation,
281+
Token parseVariableDeclarationModifiers(Token token,
283282
{Token varFinalOrConst}) {
284-
token = parseModifiers(token, typeContinuation,
285-
varFinalOrConst: varFinalOrConst);
283+
token = parseModifiers(token, null, varFinalOrConst: varFinalOrConst);
286284

287285
reportExtraneousModifier(abstractToken);
288286
reportExtraneousModifier(covariantToken);

pkg/front_end/lib/src/fasta/parser/parser.dart

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5525,15 +5525,12 @@ class Parser {
55255525
next = token.next;
55265526
}
55275527

5528-
TypeContinuation typeContinuation;
55295528
Token varFinalOrConst;
55305529
if (isModifier(next)) {
55315530
if (optional('var', next)) {
5532-
typeContinuation = TypeContinuation.OptionalAfterVar;
55335531
varFinalOrConst = token = token.next;
55345532
next = token.next;
55355533
} else if (optional('final', next) || optional('const', next)) {
5536-
typeContinuation = TypeContinuation.Optional;
55375534
varFinalOrConst = token = token.next;
55385535
next = token.next;
55395536
}
@@ -5542,13 +5539,11 @@ class Parser {
55425539
// Recovery
55435540
ModifierRecoveryContext2 modifierContext =
55445541
new ModifierRecoveryContext2(this);
5545-
token = modifierContext.parseVariableDeclarationModifiers(
5546-
token, typeContinuation,
5542+
token = modifierContext.parseVariableDeclarationModifiers(token,
55475543
varFinalOrConst: varFinalOrConst);
55485544
next = token.next;
55495545

55505546
varFinalOrConst = modifierContext.varFinalOrConst;
5551-
typeContinuation = modifierContext.typeContinuation;
55525547
modifierContext = null;
55535548
}
55545549
}
@@ -5602,15 +5597,12 @@ class Parser {
56025597
token = parseMetadataStar(token);
56035598
Token next = token.next;
56045599

5605-
TypeContinuation typeContinuation;
56065600
Token varFinalOrConst;
56075601
if (isModifier(next)) {
56085602
if (optional('var', next)) {
5609-
typeContinuation = TypeContinuation.OptionalAfterVar;
56105603
varFinalOrConst = token = token.next;
56115604
next = token.next;
56125605
} else if (optional('final', next) || optional('const', next)) {
5613-
typeContinuation = TypeContinuation.Optional;
56145606
varFinalOrConst = token = token.next;
56155607
next = token.next;
56165608
}
@@ -5619,12 +5611,10 @@ class Parser {
56195611
// Recovery
56205612
ModifierRecoveryContext2 modifierContext =
56215613
new ModifierRecoveryContext2(this);
5622-
token = modifierContext.parseVariableDeclarationModifiers(
5623-
token, typeContinuation,
5614+
token = modifierContext.parseVariableDeclarationModifiers(token,
56245615
varFinalOrConst: varFinalOrConst);
56255616

56265617
varFinalOrConst = modifierContext.varFinalOrConst;
5627-
typeContinuation = modifierContext.typeContinuation;
56285618
modifierContext = null;
56295619
}
56305620
}

0 commit comments

Comments
 (0)