Unify parsing of constructor references.

dart/lib/compiler/implementation/scanner/listener.dart

Index: dart/lib/compiler/implementation/scanner/listener.dart
diff --git a/dart/lib/compiler/implementation/scanner/listener.dart b/dart/lib/compiler/implementation/scanner/listener.dart
index 2a0572d3d6488481f04ba04b19bc59e064da2b2b..e798111f94e9f3ba7ba3382a3d318f7b94446b80 100644
--- a/dart/lib/compiler/implementation/scanner/listener.dart
+++ b/dart/lib/compiler/implementation/scanner/listener.dart
@@ -97,8 +97,7 @@ class Listener {
   void beginFactoryMethod(Token token) {
   }
 
-  void endFactoryMethod(Token startKeyword, Token periodBeforeName,
-                        Token endToken) {
+  void endFactoryMethod(Token beginToken, Token endToken) {
   }
 
   void beginFormalParameter(Token token) {
@@ -406,7 +405,7 @@ class Listener {
   void handleConditionalExpression(Token question, Token colon) {
   }
 
-  void handleConstExpression(Token token, bool named) {
+  void handleConstExpression(Token token) {
   }
 
   void handleFunctionTypedFormalParameter(Token token) {
@@ -472,7 +471,7 @@ class Listener {
   void handleNamedArgument(Token colon) {
   }
 
-  void handleNewExpression(Token token, bool named) {
+  void handleNewExpression(Token token) {
   }
 
   void handleNoArguments(Token token) {
@@ -1568,19 +1567,15 @@ class NodeListener extends ElementListener {
     pushNode(new Send(receiver, selector, arguments));
   }
 
-  void handleNewExpression(Token token, bool named) {
+  void handleNewExpression(Token token) {
     NodeList arguments = popNode();
     Node name = popNode();
-    if (named) {
-      TypeAnnotation type = popNode();
-      name = new Send(type, name);
-    }
     pushNode(new NewExpression(token, new Send(null, name, arguments)));
   }
 
-  void handleConstExpression(Token token, bool named) {
+  void handleConstExpression(Token token) {
     // [token] carries the 'const' information.
-    handleNewExpression(token, named);
+    handleNewExpression(token);
   }
 
   void handleOperatorName(Token operatorKeyword, Token token) {
@@ -1685,25 +1680,14 @@ class NodeListener extends ElementListener {
     pushNode(new EmptyStatement(token));
   }
 
-  void endFactoryMethod(Token startKeyword, Token periodBeforeName,
-                        Token endToken) {
+  void endFactoryMethod(Token beginToken, Token endToken) {
     Statement body = popNode();
     NodeList formals = popNode();
-    // TODO(karlklose): don't throw type parameters away.
-    NodeList typeParameters;
-    Node name;
-    if (periodBeforeName != null) {
-      name = popNode();
-      typeParameters = popNode();
-      // A library prefix was handled in [handleQualified].
-      name = new Send(popNode(), name);
-    } else {
-      typeParameters = popNode();
-      name = popNode();
-    }
+    Node name = popNode();
+
     // TODO(ahe): Move this parsing to the parser.
     int modifierCount = 0;
-    Token modifier = startKeyword;
+    Token modifier = beginToken;
     if (modifier.stringValue == "external") {
       handleModifier(modifier);
       modifierCount++;