Implement parsing and resolving of type-variables.

frog/leg/scanner/parser.dart

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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.
  */
 class Parser {
   final Listener listener;
   bool mayParseFunctionExpressions = true;
@@ skipping 299 matching lines @@
 
   Token parseTypeArgumentsOpt(Token token) {
     return parseStuff(token,
                       (t) => listener.beginTypeArguments(t),
                       (t) => parseType(t),
                       (c, bt, et) => listener.endTypeArguments(c, bt, et),
                       (t) => listener.handleNoTypeArguments(t));
   }
 
   Token parseTypeVariablesOpt(Token token) {
-    if (optional('<', token)) {
-      BeginGroupToken beginGroupToken = token;
-      // TODO(ahe): Parse type variables.
-
-      // For now, skip to the matching '>' if it exists. Otherwise,
-      // don't advance and assume the caller will report some kind of
-      // error.
-      if (beginGroupToken.endGroup !== null) {
-        token = beginGroupToken.endGroup.next;
-      }
-    }
-    listener.handleNoTypeVariables(token);
-    return token;
-  }
-
-  Token parseTypeVariablesOptX(Token token) {
     return parseStuff(token,
                       (t) => listener.beginTypeVariables(t),
                       (t) => parseTypeVariable(t),
                       (c, bt, et) => listener.endTypeVariables(c, bt, et),
                       (t) => listener.handleNoTypeVariables(t));
   }
 
   // TODO(ahe): Clean this up.
   Token parseStuff(Token token, Function beginStuff, Function stuffParser,
                    Function endStuff, Function handleNoStuff) {
@@ skipping 1248 matching lines @@
     }
     listener.handleContinueStatement(hasTarget, continueKeyword, token);
     return expectSemicolon(token);
   }
 
   Token parseEmptyStatement(Token token) {
     listener.handleEmptyStatement(token);
     return expectSemicolon(token);
   }
 }