cleanup fasta token classes

pkg/front_end/test/scanner_fasta_test.dart

 // Copyright (c) 2017, 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.
 
 import 'package:analyzer/src/fasta/token_utils.dart';
 import 'package:front_end/src/fasta/scanner/error_token.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/string_scanner.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/token.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/token_constants.dart' as fasta;
 import 'package:front_end/src/scanner/errors.dart';
@@ skipping 326 matching lines @@
     return token;
   }
 }
 
 /// Base class for scanner tests that examine the token stream in Fasta format.
 abstract class ScannerTest_Fasta_Base {
   Token scan(String source);
 
   void test_match_angle_brackets() {
     var x = scan('x<y>');
-    var lessThan = x.next as fasta.BeginGroupToken;
+    var lessThan = x.next as BeginToken;
     var y = lessThan.next;
     var greaterThan = y.next;
     expect(greaterThan.next.isEof, isTrue);
     expect(lessThan.endGroup, same(greaterThan));
   }
 
   void test_match_angle_brackets_gt_gt() {
     // When a ">>" appears in the token stream, Fasta's scanner matches it to
     // the outer "<".  The inner "<" is left unmatched.
     var x = scan('x<y<z>>');
-    var lessThan1 = x.next as fasta.BeginGroupToken;
+    var lessThan1 = x.next as BeginToken;
     var y = lessThan1.next;
-    var lessThan2 = y.next as fasta.BeginGroupToken;
+    var lessThan2 = y.next as BeginToken;
     var z = lessThan2.next;
     var greaterThans = z.next;
     expect(greaterThans.next.isEof, isTrue);
     expect(lessThan1.endGroup, same(greaterThans));
     expect(lessThan2.endGroup, isNull);
   }
 
   void test_match_angle_brackets_interrupted_by_close_brace() {
     // A "}" appearing in the token stream interrupts matching of "<" and ">".
-    var openBrace = scan('{x<y}>z') as fasta.BeginGroupToken;
+    var openBrace = scan('{x<y}>z') as BeginToken;
     var x = openBrace.next;
-    var lessThan = x.next as fasta.BeginGroupToken;
+    var lessThan = x.next as BeginToken;
     var y = lessThan.next;
     var closeBrace = y.next;
     var greaterThan = closeBrace.next;
     var z = greaterThan.next;
     expect(z.next.isEof, isTrue);
     expect(openBrace.endGroup, same(closeBrace));
     expect(lessThan.endGroup, isNull);
   }
 
   void test_match_angle_brackets_interrupted_by_close_bracket() {
     // A "]" appearing in the token stream interrupts matching of "<" and ">".
-    var openBracket = scan('[x<y]>z') as fasta.BeginGroupToken;
+    var openBracket = scan('[x<y]>z') as BeginToken;
     var x = openBracket.next;
-    var lessThan = x.next as fasta.BeginGroupToken;
+    var lessThan = x.next as BeginToken;
     var y = lessThan.next;
     var closeBracket = y.next;
     var greaterThan = closeBracket.next;
     var z = greaterThan.next;
     expect(z.next.isEof, isTrue);
     expect(openBracket.endGroup, same(closeBracket));
     expect(lessThan.endGroup, isNull);
   }
 
   void test_match_angle_brackets_interrupted_by_close_paren() {
     // A ")" appearing in the token stream interrupts matching of "<" and ">".
-    var openParen = scan('(x<y)>z') as fasta.BeginGroupToken;
+    var openParen = scan('(x<y)>z') as BeginToken;
     var x = openParen.next;
-    var lessThan = x.next as fasta.BeginGroupToken;
+    var lessThan = x.next as BeginToken;
     var y = lessThan.next;
     var closeParen = y.next;
     var greaterThan = closeParen.next;
     var z = greaterThan.next;
     expect(z.next.isEof, isTrue);
     expect(openParen.endGroup, same(closeParen));
     expect(lessThan.endGroup, isNull);
   }
 
   void test_match_angle_brackets_interrupted_by_interpolation_expr() {
     // A "${" appearing in the token stream interrupts matching of "<" and ">".
     var x = scan(r'x<"${y>z}"');
-    var lessThan = x.next as fasta.BeginGroupToken;
+    var lessThan = x.next as BeginToken;
     var beginString = lessThan.next;
-    var beginInterpolation = beginString.next as fasta.BeginGroupToken;
+    var beginInterpolation = beginString.next as BeginToken;
     var y = beginInterpolation.next;
     var greaterThan = y.next;
     var z = greaterThan.next;
     var endInterpolation = z.next;
     var endString = endInterpolation.next;
     expect(endString.next.isEof, isTrue);
     expect(lessThan.endGroup, isNull);
     expect(beginInterpolation.endGroup, same(endInterpolation));
   }
 
   void test_match_angle_brackets_interrupted_by_open_brace() {
     // A "{" appearing in the token stream interrupts matching of "<" and ">".
     var x = scan('x<{y>z}');
-    var lessThan = x.next as fasta.BeginGroupToken;
-    var openBrace = lessThan.next as fasta.BeginGroupToken;
+    var lessThan = x.next as BeginToken;
+    var openBrace = lessThan.next as BeginToken;
     var y = openBrace.next;
     var greaterThan = y.next;
     var z = greaterThan.next;
     var closeBrace = z.next;
     expect(closeBrace.next.isEof, isTrue);
     expect(lessThan.endGroup, isNull);
     expect(openBrace.endGroup, same(closeBrace));
   }
 
   void test_match_angle_brackets_interrupted_by_open_bracket() {
     // A "[" appearing in the token stream interrupts matching of "<" and ">".
     var x = scan('x<y[z>a]');
-    var lessThan = x.next as fasta.BeginGroupToken;
+    var lessThan = x.next as BeginToken;
     var y = lessThan.next;
-    var openBracket = y.next as fasta.BeginGroupToken;
+    var openBracket = y.next as BeginToken;
     var z = openBracket.next;
     var greaterThan = z.next;
     var a = greaterThan.next;
     var closeBracket = a.next;
     expect(closeBracket.next.isEof, isTrue);
     expect(lessThan.endGroup, isNull);
     expect(openBracket.endGroup, same(closeBracket));
   }
 
   void test_match_angle_brackets_interrupted_by_open_paren() {
     // A "(" appearing in the token stream interrupts matching of "<" and ">".
     var x = scan('x<y(z>a)');
-    var lessThan = x.next as fasta.BeginGroupToken;
+    var lessThan = x.next as BeginToken;
     var y = lessThan.next;
-    var openParen = y.next as fasta.BeginGroupToken;
+    var openParen = y.next as BeginToken;
     var z = openParen.next;
     var greaterThan = z.next;
     var a = greaterThan.next;
     var closeParen = a.next;
     expect(closeParen.next.isEof, isTrue);
     expect(lessThan.endGroup, isNull);
     expect(openParen.endGroup, same(closeParen));
   }
 
   void test_match_angle_brackets_nested() {
     var x = scan('x<y<z>,a>');
-    var lessThan1 = x.next as fasta.BeginGroupToken;
+    var lessThan1 = x.next as BeginToken;
     var y = lessThan1.next;
-    var lessThan2 = y.next as fasta.BeginGroupToken;
+    var lessThan2 = y.next as BeginToken;
     var z = lessThan2.next;
     var greaterThan1 = z.next;
     var comma = greaterThan1.next;
     var a = comma.next;
     var greaterThan2 = a.next;
     expect(greaterThan2.next.isEof, isTrue);
     expect(lessThan1.endGroup, same(greaterThan2));
     expect(lessThan2.endGroup, same(greaterThan1));
   }
 
   void test_match_angle_brackets_unmatched_gt_gt() {
     // When a ">>" appears in the token stream and there is no outer "<",
     // Fasta's scanner leaves the inner "<" unmatched.
     var x = scan('x<y>>z');
-    var lessThan = x.next as fasta.BeginGroupToken;
+    var lessThan = x.next as BeginToken;
     var y = lessThan.next;
     var greaterThans = y.next;
     var z = greaterThans.next;
     expect(z.next.isEof, isTrue);
     expect(lessThan.endGroup, isNull);
   }
 }
 
 /// Scanner tests that exercise the Fasta scanner directly.
 @reflectiveTest
@@ skipping 23 matching lines @@
   final ErrorListener _listener;
 
   ToAnalyzerTokenStreamConverter_WithListener(this._listener);
 
   @override
   void reportError(
       ScannerErrorCode errorCode, int offset, List<Object> arguments) {
     _listener.errors.add(new TestError(offset, errorCode, arguments));
   }
 }