flatten token hierarchy

pkg/analyzer/lib/src/generated/parser.dart

 // Copyright (c) 2014, 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 analyzer.parser;
 
 import 'dart:collection';
 import "dart:math" as math;
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 5946 matching lines @@
    * will have any comments that might have preceeded the token.
    */
   Token _createToken(Token token, TokenType type, {bool isBegin: false}) {
     CommentToken comments = token.precedingComments;
     if (comments == null) {
       if (isBegin) {
         return new BeginToken(type, token.offset);
       }
       return new Token(type, token.offset);
     } else if (isBegin) {
-      return new BeginTokenWithComment(type, token.offset, comments);
+      return new BeginToken(type, token.offset, comments);
     }
-    return new TokenWithComment(type, token.offset, comments);
+    return new Token(type, token.offset, comments);
   }
 
   /**
    * Check that the given [expression] is assignable and report an error if it
    * isn't.
    *
    *     assignableExpression ::=
    *         primary (arguments* assignableSelector)+
    *       | 'super' unconditionalAssignableSelector
    *       | identifier
@@ skipping 2669 matching lines @@
     }
   }
 }
 
 /**
  * Instances of this class are thrown when the parser detects that AST has
  * too many nested expressions to be parsed safely and avoid possibility of
  * [StackOverflowError] in the parser or during later analysis.
  */
 class _TooDeepTreeError {}