Fix some parser issues related to generic functin types

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.src.generated.parser;
 
 import 'dart:collection';
 import "dart:math" as math;
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 3336 matching lines @@
       CommentAndMetadata commentAndMetadata, Token keyword) {
     Identifier name = _parseSimpleIdentifierUnchecked(isDeclaration: true);
     TypeParameterList typeParameters = null;
     if (_matches(TokenType.LT)) {
       typeParameters = parseTypeParameterList();
     }
     Token equals = _expect(TokenType.EQ);
     TypeAnnotation functionType = parseTypeAnnotation(false);
     Token semicolon = _expect(TokenType.SEMICOLON);
     if (functionType is! GenericFunctionType) {
-      // TODO(brianwilkerson) Generate an error and recover (better than this).
+      // TODO(brianwilkerson) Generate a better error.
+      _reportErrorForToken(
+          ParserErrorCode.INVALID_GENERIC_FUNCTION_TYPE, semicolon);
+      // TODO(brianwilkerson) Recover better than this.
       return astFactory.genericTypeAlias(
           commentAndMetadata.comment,
           commentAndMetadata.metadata,
           keyword,
           name,
           typeParameters,
           equals,
           null,
           semicolon);
     }
@@ skipping 2257 matching lines @@
    * This method must be kept in sync with [parseTypeParameterList].
    */
   Token skipTypeParameterList(Token startToken) {
     if (!_tokenMatches(startToken, TokenType.LT)) {
       return null;
     }
     int depth = 1;
     Token previous = startToken;
     Token next = startToken.next;
     while (next != previous) {
-      if (_tokenMatches(startToken, TokenType.LT)) {
+      if (_tokenMatches(next, TokenType.LT)) {
         depth++;
       } else if (_tokenMatches(next, TokenType.GT)) {
         depth--;
         if (depth == 0) {
           return next;
         }
       }
       previous = next;
       next = next.next;
     }
@@ skipping 2860 matching lines @@
    */
   Parser_SyntheticKeywordToken(Keyword keyword, int offset)
       : super(keyword, offset);
 
   @override
   int get length => 0;
 
   @override
   Token copy() => new Parser_SyntheticKeywordToken(keyword, offset);
 }