Match "<", ">", and ">>" when translating analyzer tokens to Fasta tokens.

pkg/front_end/lib/src/fasta/analyzer/token_utils.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.token_utils;
 
 import 'package:front_end/src/fasta/parser/error_kind.dart' show
     ErrorKind;
 
 import 'package:front_end/src/fasta/scanner/error_token.dart' show
@@ skipping 117 matching lines @@
 /// TODO(paulberry): Analyzer tokens do not record error conditions, so a round
 /// trip through this function and [toAnalyzerTokenStream] will lose error
 /// information.
 Token fromAnalyzerTokenStream(analyzer.Token analyzerToken) {
   Token tokenHead = new SymbolToken(EOF_INFO, -1);
   Token tokenTail = tokenHead;
   // Note: beginTokenStack and endTokenStack are seeded with a sentinel value
   // so that we don't have to check if they're empty.
   var beginTokenStack = <BeginGroupToken>[null];
   var endTokenStack = <analyzer.Token>[null];
+  var angleBracketStack = <BeginGroupToken>[];
   void matchGroups(analyzer.Token analyzerToken, Token translatedToken) {
     // If this token closes a group, set the corresponding opener token to point
     // to it.
     if (identical(endTokenStack.last, analyzerToken)) {
+      angleBracketStack.clear();
       beginTokenStack.last.endGroup = translatedToken;
       beginTokenStack.removeLast();
       endTokenStack.removeLast();
+    } else if (translatedToken.info.kind == LT_TOKEN) {
+      BeginGroupToken beginGroupToken = translatedToken;
+      angleBracketStack.add(beginGroupToken);
+    } else if (translatedToken.info.kind == GT_TOKEN &&
+        angleBracketStack.isNotEmpty) {
+      angleBracketStack.removeLast().endGroup = translatedToken;
+    } else if (translatedToken.info.kind == GT_GT_TOKEN &&
+        angleBracketStack.isNotEmpty) {
+      angleBracketStack.removeLast();
+      if (angleBracketStack.isNotEmpty) {
+        angleBracketStack.removeLast().endGroup = translatedToken;
+      }
     }
     // If this token opens a group, and there is a matching closer, put it on
     // the stack.
     // TODO(paulberry): generate synthetic closer tokens and "UnmatchedToken"
     // tokens as appropriate.
-    // TODO(paulberry): match up "<" and ">"/">>" (analyzer doesn't match
-    // these).
     if (translatedToken is BeginGroupToken &&
         analyzerToken is analyzer.BeginToken &&
         analyzerToken.endToken != null) {
+      angleBracketStack.clear();
       beginTokenStack.add(translatedToken);
       endTokenStack.add(analyzerToken.endToken);
     }
   }
 
   analyzer.Token translateAndAppend(analyzer.Token analyzerToken) {
     var token = fromAnalyzerToken(analyzerToken);
     tokenTail.next = token;
     tokenTail = token;
     matchGroups(analyzerToken, token);
@@ skipping 104 matching lines @@
       return symbol(GT_GT_INFO);
     case TokenType.GT_GT_EQ:
       return symbol(GT_GT_EQ_INFO);
     case TokenType.HASH:
       return symbol(HASH_INFO);
     case TokenType.INDEX:
       return symbol(INDEX_INFO);
     case TokenType.INDEX_EQ:
       return symbol(INDEX_EQ_INFO);
     case TokenType.LT:
-      return symbol(LT_INFO);
+      return beginGroup(LT_INFO);
     case TokenType.LT_EQ:
       return symbol(LT_EQ_INFO);
     case TokenType.LT_LT:
       return symbol(LT_LT_INFO);
     case TokenType.LT_LT_EQ:
       return symbol(LT_LT_EQ_INFO);
     case TokenType.MINUS:
       return symbol(MINUS_INFO);
     case TokenType.MINUS_EQ:
       return symbol(MINUS_EQ_INFO);
@@ skipping 346 matching lines @@
     case BACKSLASH_TOKEN: return TokenType.BACKSLASH;
     case PERIOD_PERIOD_PERIOD_TOKEN: return TokenType.PERIOD_PERIOD_PERIOD;
     // case GENERIC_METHOD_TYPE_LIST_TOKEN:
     //   return TokenType.GENERIC_METHOD_TYPE_LIST;
     // case GENERIC_METHOD_TYPE_ASSIGN_TOKEN:
     //   return TokenType.GENERIC_METHOD_TYPE_ASSIGN;
     default:
       return internalError("Unhandled token ${token.info}");
   }
 }