Parse method names that include type variables.

compiler/java/com/google/dart/compiler/parser/DartParser.java

 // Copyright (c) 2011, 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.
 
 package com.google.dart.compiler.parser;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.CharStreams;
 import com.google.dart.compiler.DartCompilationError;
 import com.google.dart.compiler.DartCompilerListener;
@@ skipping 943 matching lines @@
       // Simple checks
       if (peekPseudoKeyword(0, GETTER_KEYWORD)
           || peekPseudoKeyword(0, SETTER_KEYWORD)
           || peekPseudoKeyword(0, OPERATOR_KEYWORD)) {
         return true;
       }
 
       consume(Token.IDENTIFIER);
 
       if (peek(0).equals(Token.PERIOD) && peek(1).equals(Token.IDENTIFIER)) {
-        // Case 1 a constructor of the form class.id
-        if (peek(0).equals(Token.LPAREN)) {
-          return true;
-        }
-
         // Case 2, a constructor of the form library.class.<typearguments?>.id

[codefu, 2011/12/02 13:51:21]

There's no more case 1 prior to this comment.

         consume(Token.PERIOD);
         consume(Token.IDENTIFIER);
-        parseTypeArgumentsOpt();
-        if (peek(0).equals(Token.PERIOD) && peek(1).equals(Token.IDENTIFIER) && peek(2).equals(Token.LPAREN)) {
+                parseTypeArgumentsOpt();

[codefu, 2011/12/02 13:51:21]

ws

+        if (peek(0).equals(Token.PERIOD) && peek(1).equals(Token.IDENTIFIER)
+            && peek(2).equals(Token.LPAREN)) {
           return true;
         }
+      } else {
+        // Case 1 class.id<typearguments>
+        // Case 3, id<typearguments?>
+        parseTypeArgumentsOpt();
       }
 
-      // Case 1 class.id<typearguments>
-      // Case 3, id<typearguments?>
-      parseTypeArgumentsOpt();
-
       if (peek(0).equals(Token.PERIOD) && peek(1).equals(Token.IDENTIFIER)) {
         // Case 1, a constructor of the form class<typearguments>.id
         consume(Token.PERIOD);
         consume(Token.IDENTIFIER);
       }
 
       // next token should be LPAREN
       return (peek(0).equals(Token.LPAREN));
     } finally {
       rollback();
@@ skipping 90 matching lines @@
         name = parseIdentifier();
         modifiers = modifiers.makeGetter();
         arity = 0;
       } else if (optionalPseudoKeyword(SETTER_KEYWORD)) {
         name = parseIdentifier();
         modifiers = modifiers.makeSetter();
         arity = 1;
       } else {
         // Normal method or property.
         name = parseIdentifier();
-
         // TODO(zundel): something constructive with the type arguments
-         parseTypeArgumentsOpt();
+        parseTypeArgumentsOpt();
       }
 
       // Check for named constructor.
       if (optional(Token.PERIOD)) {
         name = doneWithoutConsuming(new DartPropertyAccess(name, parseIdentifier()));
 
         if (optional(Token.PERIOD)) {
           name = doneWithoutConsuming(new DartPropertyAccess(name, parseIdentifier()));
         }
       }
@@ skipping 2615 matching lines @@
     } else {
       ctx.error(dartError);
       errorHistory.add(dartError.hashCode());
     }
   }
 
   private void reportError(DartNode node, ErrorCode errorCode, Object... arguments) {
     reportError(new DartCompilationError(node, errorCode, arguments));
   }
 }