cleanup fasta token classes

pkg/analyzer/lib/src/fasta/ast_builder.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.analyzer.ast_builder;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/dart/ast/ast_factory.dart' show AstFactory;
 import 'package:analyzer/dart/ast/standard_ast_factory.dart' as standard;
 import 'package:analyzer/dart/ast/token.dart' as analyzer show Token;
 import 'package:analyzer/dart/ast/token.dart' show Token, TokenType;
 import 'package:analyzer/dart/element/element.dart' show Element;
 import 'package:front_end/src/fasta/parser/parser.dart'
     show FormalParameterType, MemberKind, Parser;
 import 'package:front_end/src/fasta/scanner/string_scanner.dart';
-import 'package:front_end/src/fasta/scanner/token.dart'
-    show BeginGroupToken, CommentToken;
+import 'package:front_end/src/fasta/scanner/token.dart' show CommentToken;
 import 'package:front_end/src/scanner/token.dart' as analyzer;
 
 import 'package:front_end/src/fasta/errors.dart' show internalError;
 import 'package:front_end/src/fasta/fasta_codes.dart'
     show FastaMessage, codeExpectedExpression, codeExpectedFunctionBody;
 import 'package:front_end/src/fasta/kernel/kernel_builder.dart'
     show Builder, KernelLibraryBuilder, ProcedureBuilder, Scope;
 import 'package:front_end/src/fasta/parser/identifier_context.dart'
     show IdentifierContext;
 import 'package:front_end/src/fasta/quote.dart';
@@ skipping 89 matching lines @@
         token, constructorName, arguments.argumentList));
   }
 
   @override
   void endNewExpression(Token token) {
     debugEvent("NewExpression");
     _handleInstanceCreation(token);
   }
 
   @override
-  void handleParenthesizedExpression(BeginGroupToken token) {
+  void handleParenthesizedExpression(analyzer.BeginToken token) {
     debugEvent("ParenthesizedExpression");
     Expression expression = pop();
     push(ast.parenthesizedExpression(token, expression, token.endGroup));
   }
 
   void handleStringPart(Token token) {
     debugEvent("StringPart");
     push(token);
   }
 
@@ skipping 252 matching lines @@
       bool hasExpression, Token beginToken, Token endToken) {
     debugEvent("ReturnStatement");
     Expression expression = hasExpression ? pop() : null;
     push(ast.returnStatement(beginToken, expression, endToken));
   }
 
   void endIfStatement(Token ifToken, Token elseToken) {
     Statement elsePart = popIfNotNull(elseToken);
     Statement thenPart = pop();
     Expression condition = pop();
-    BeginGroupToken leftParenthesis = ifToken.next;
+    analyzer.BeginToken leftParenthesis = ifToken.next;
     push(ast.ifStatement(ifToken, ifToken.next, condition,
         leftParenthesis.endGroup, thenPart, elseToken, elsePart));
   }
 
   void handleNoInitializers() {
     debugEvent("NoInitializers");
     push(NullValue.ConstructorInitializerSeparator);
     push(NullValue.ConstructorInitializers);
   }
 
@@ skipping 145 matching lines @@
   void endForStatement(Token forKeyword, Token leftSeparator,
       int updateExpressionCount, Token endToken) {
     debugEvent("ForStatement");
     Statement body = pop();
     List<Expression> updates = popList(updateExpressionCount);
     Statement conditionStatement = pop();
     Object initializerPart = pop();
     exitLocalScope();
     exitContinueTarget();
     exitBreakTarget();
-    BeginGroupToken leftParenthesis = forKeyword.next;
+    analyzer.BeginToken leftParenthesis = forKeyword.next;
 
     VariableDeclarationList variableList;
     Expression initializer;
     if (initializerPart is VariableDeclarationStatement) {
       variableList = initializerPart.variables;
     } else {
       initializer = initializerPart as Expression;
     }
 
     Expression condition;
@@ skipping 1155 matching lines @@
       push(ast.genericTypeAlias(comment, metadata, typedefKeyword, name,
           templateParameters, equals, type, endToken));
     }
   }
 
   @override
   void endEnum(Token enumKeyword, Token endBrace, int count) {
     debugEvent("Enum");
     List<EnumConstantDeclaration> constants = popList(count);
     // TODO(paulberry,ahe): the parser should pass in the openBrace token.
-    var openBrace = enumKeyword.next.next as BeginGroupToken;
+    var openBrace = enumKeyword.next.next as analyzer.BeginToken;
     // TODO(paulberry): what if the '}' is missing and the parser has performed
     // error recovery?
     Token closeBrace = openBrace.endGroup;
     SimpleIdentifier name = pop();
     List<Annotation> metadata = pop();
     Comment comment = pop();
     push(ast.enumDeclaration(comment, metadata, enumKeyword, name, openBrace,
         constants, closeBrace));
   }
 
@@ skipping 263 matching lines @@
       } else if (identical('var', s)) {
         finalConstOrVarKeyword = token;
       } else if (identical('covariant', s)) {
         covariantKeyword = token;
       } else {
         internalError('Unhandled modifier: $s');
       }
     }
   }
 }