From 236c8dae8d75bd6355860bd2fad2bed44cd54927 Mon Sep 17 00:00:00 2001 From: danrubel Date: Thu, 15 Mar 2018 19:32:35 +0000 Subject: [PATCH] Remove unnecessary typeContinuation variable Change-Id: I1a78007491598b3a2d17091e96519182bd921f8d Reviewed-on: https://dart-review.googlesource.com/46569 Reviewed-by: Brian Wilkerson Commit-Queue: Dan Rubel --- .../lib/src/fasta/parser/modifier_context.dart | 6 ++---- pkg/front_end/lib/src/fasta/parser/parser.dart | 14 ++------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/pkg/front_end/lib/src/fasta/parser/modifier_context.dart b/pkg/front_end/lib/src/fasta/parser/modifier_context.dart index fd95bba8565..546501b74ff 100644 --- a/pkg/front_end/lib/src/fasta/parser/modifier_context.dart +++ b/pkg/front_end/lib/src/fasta/parser/modifier_context.dart @@ -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); diff --git a/pkg/front_end/lib/src/fasta/parser/parser.dart b/pkg/front_end/lib/src/fasta/parser/parser.dart index 5203691a6d3..0778f66f020 100644 --- a/pkg/front_end/lib/src/fasta/parser/parser.dart +++ b/pkg/front_end/lib/src/fasta/parser/parser.dart @@ -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; } }