Properly parse > in end of types.

lib/compiler/implementation/scanner/parser.dart

 // Copyright (c) 2012, 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.
 
 /**
  * An event generating parser of Dart programs. This parser expects
  * all tokens in a linked list (aka a token stream).
  *
  * The class [Scanner] is used to generate a token stream. See the
  * file scanner.dart.
@@ skipping 243 matching lines @@
     if (isIdentifier(token)) {
       listener.handleIdentifier(token);
     } else {
       listener.expectedIdentifier(token);
     }
     return token.next;
   }
 
   Token expect(String string, Token token) {
     if (string !== token.stringValue) {
-      if (string === '>') {
-        if (token.stringValue === '>>') {
-          Token gt = new Token(GT_INFO, token.charOffset + 1);
-          gt.next = token.next;
-          return gt;
-        } else if (token.stringValue === '>>>') {
-          Token gtgt = new Token(GT_GT_INFO, token.charOffset + 1);
-          gtgt.next = token.next;
-          return gtgt;
-        }
-      }
       return listener.expected(string, token);
     }
     return token.next;
   }
 
   Token parseTypeVariable(Token token) {
     listener.beginTypeVariable(token);
     token = parseIdentifier(token);
     if (optional('extends', token)) {
       token = parseType(token.next);
@@ skipping 43 matching lines @@
   Token parseStuff(Token token, Function beginStuff, Function stuffParser,
                    Function endStuff, Function handleNoStuff) {
     if (optional('<', token)) {
       Token begin = token;
       beginStuff(begin);
       int count = 0;
       do {
         token = stuffParser(token.next);
         ++count;
       } while (optional(',', token));
+      Token next = token.next;
+      if (token.stringValue === '>>') {
+        token = new Token(GT_INFO, token.charOffset);
+        token.next = new Token(GT_INFO, token.charOffset + 1);
+        token.next.next = next;
+      } else if (token.stringValue === '>>>') {
+        token = new Token(GT_INFO, token.charOffset);
+        token.next = new Token(GT_GT_INFO, token.charOffset + 1);
+        token.next.next = next;
+      }
       endStuff(count, begin, token);
       return expect('>', token);
     }
     handleNoStuff(token);
     return token;
   }
 
   Token parseTopLevelMember(Token token) {
     Token start = token;
     listener.beginTopLevelMember(token);
@@ skipping 1323 matching lines @@
     }
     listener.handleContinueStatement(hasTarget, continueKeyword, token);
     return expectSemicolon(token);
   }
 
   Token parseEmptyStatement(Token token) {
     listener.handleEmptyStatement(token);
     return expectSemicolon(token);
   }
 }