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

Remove unnecessary typeContinuation variable

Browse Source 
Change-Id: I1a78007491598b3a2d17091e96519182bd921f8d
Reviewed-on: https://dart-review.googlesource.com/46569
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Dan Rubel <danrubel@google.com>
This commit is contained in:
danrubel
2018-03-15 19:32:35 +00:00
committed by commit-bot@chromium.org
parent a0295ffa0e
commit 236c8dae8d
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/front_end/lib/src/fasta/parser/modifier_context.dart
+2 -4
View File
@@ -278,11 +278,9 @@ class ModifierRecoveryContext2 {
}
/// Parse modifiers for variable declarations.
Token parseVariableDeclarationModifiers(
Token token, TypeContinuation typeContinuation,
Token parseVariableDeclarationModifiers(Token token,
{Token varFinalOrConst}) {
token = parseModifiers(token, typeContinuation,
varFinalOrConst: varFinalOrConst);
token = parseModifiers(token, null, varFinalOrConst: varFinalOrConst);
reportExtraneousModifier(abstractToken);
reportExtraneousModifier(covariantToken);
pkg/front_end/lib/src/fasta/parser/parser.dart
+2 -12
View File
@@ -5525,15 +5525,12 @@ class Parser {
next = token.next;
}
TypeContinuation typeContinuation;
Token varFinalOrConst;
if (isModifier(next)) {
if (optional('var', next)) {
typeContinuation = TypeContinuation.OptionalAfterVar;
varFinalOrConst = token = token.next;
next = token.next;
} else if (optional('final', next) || optional('const', next)) {
typeContinuation = TypeContinuation.Optional;
varFinalOrConst = token = token.next;
next = token.next;
}
@@ -5542,13 +5539,11 @@ class Parser {
// Recovery
ModifierRecoveryContext2 modifierContext =
new ModifierRecoveryContext2(this);
token = modifierContext.parseVariableDeclarationModifiers(
token, typeContinuation,
token = modifierContext.parseVariableDeclarationModifiers(token,
varFinalOrConst: varFinalOrConst);
next = token.next;
varFinalOrConst = modifierContext.varFinalOrConst;
typeContinuation = modifierContext.typeContinuation;
modifierContext = null;
}
}
@@ -5602,15 +5597,12 @@ class Parser {
token = parseMetadataStar(token);
Token next = token.next;
TypeContinuation typeContinuation;
Token varFinalOrConst;
if (isModifier(next)) {
if (optional('var', next)) {
typeContinuation = TypeContinuation.OptionalAfterVar;
varFinalOrConst = token = token.next;
next = token.next;
} else if (optional('final', next) || optional('const', next)) {
typeContinuation = TypeContinuation.Optional;
varFinalOrConst = token = token.next;
next = token.next;
}
@@ -5619,12 +5611,10 @@ class Parser {
// Recovery
ModifierRecoveryContext2 modifierContext =
new ModifierRecoveryContext2(this);
token = modifierContext.parseVariableDeclarationModifiers(
token, typeContinuation,
token = modifierContext.parseVariableDeclarationModifiers(token,
varFinalOrConst: varFinalOrConst);
varFinalOrConst = modifierContext.varFinalOrConst;
typeContinuation = modifierContext.typeContinuation;
modifierContext = null;
}
}