Implement generalized function types.

pkg/compiler/lib/src/parser/node_listener.dart

 // Copyright (c) 2015, 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 dart2js.parser.node_listener;
 
 import 'package:front_end/src/fasta/parser/parser.dart'
-    show FormalParameterType;
+    show FormalParameterType, MemberKind;
 import 'package:front_end/src/fasta/parser/identifier_context.dart'
     show IdentifierContext;
 import 'package:front_end/src/fasta/scanner.dart' show SymbolToken, Token;
 import 'package:front_end/src/scanner/token.dart' show TokenType;
 
 import '../common.dart';
 import '../elements/elements.dart' show CompilationUnitElement;
 import '../tree/tree.dart';
 import '../util/util.dart' show Link;
 import 'element_listener.dart' show ElementListener, ScannerOptions;
@@ skipping 203 matching lines @@
     NodeList formals = popNode();
     NodeList typeVariables = popNode();
     Identifier name = popNode();
     TypeAnnotation type = popNode();
     Modifiers modifiers = popNode();
     pushNode(new FunctionExpression(name, typeVariables, formals, body, type,
         modifiers, null, getOrSet, asyncModifier));
   }
 
   @override
-  void endFormalParameter(Token covariantKeyword, Token thisKeyword,
-      Token nameToken, FormalParameterType kind) {
+  void endFormalParameter(Token thisKeyword, Token nameToken,
+      FormalParameterType kind, MemberKind memberKind) {
     Expression name = popNode();
     if (thisKeyword != null) {
       Identifier thisIdentifier = new Identifier(thisKeyword);
       if (name.asSend() == null) {
         name = new Send(thisIdentifier, name);
       } else {
         name = name.asSend().copyWithReceiver(thisIdentifier, false);
       }
     }
     TypeAnnotation type = popNode();
     Modifiers modifiers = popNode();
     NodeList metadata = popNode();
     pushNode(new VariableDefinitions.forParameter(
         metadata, type, modifiers, new NodeList.singleton(name)));
   }
 
   @override
-  void endFormalParameters(int count, Token beginToken, Token endToken) {
+  void endFormalParameters(
+      int count, Token beginToken, Token endToken, MemberKind kind) {
     pushNode(makeNodeList(count, beginToken, endToken, ","));
   }
 
   @override
-  void handleNoFormalParameters(Token token) {
+  void handleNoFormalParameters(Token token, MemberKind kind) {
     pushNode(null);
   }
 
   @override
   void endArguments(int count, Token beginToken, Token endToken) {
     pushNode(makeNodeList(count, beginToken, endToken, ","));
   }
 
   @override
   void handleNoArguments(Token token) {
@@ skipping 394 matching lines @@
   void endMember() {
     // TODO(sigmund): consider moving metadata into each declaration
     // element instead.
     Node node = popNode(); // member
     popNode(); // Discard metadata
     pushNode(node);
     super.endMember();
   }
 
   @override
-  void endFields(
-      int count, Token covariantKeyword, Token beginToken, Token endToken) {
+  void endFields(int count, Token beginToken, Token endToken) {
     NodeList variables = makeNodeList(count, null, endToken, ",");
     TypeAnnotation type = popNode();
     Modifiers modifiers = popNode();
     pushNode(new VariableDefinitions(type, modifiers, variables));
   }
 
   @override
   void endMethod(Token getOrSet, Token beginToken, Token endToken) {
     Statement body = popNode();
     AsyncModifier asyncModifier = popNode();
@@ skipping 78 matching lines @@
   }
 
   @override
   void endOptionalFormalParameters(
       int count, Token beginToken, Token endToken) {
     pushNode(makeNodeList(count, beginToken, endToken, ','));
   }
 
   @override
   void endFunctionTypedFormalParameter(
-      Token covariantKeyword, Token thisKeyword, FormalParameterType kind) {
+      Token thisKeyword, FormalParameterType kind) {
     NodeList formals = popNode();
     NodeList typeVariables = popNode();
     Identifier name = popNode();
     TypeAnnotation returnType = popNode();
     pushNode(null); // Signal "no type" to endFormalParameter.
     pushNode(new FunctionExpression(name, typeVariables, formals, null,
         returnType, Modifiers.EMPTY, null, null, null));
   }
 
   @override
@@ skipping 253 matching lines @@
     }
     lastErrorWasNativeFunctionBody = false;
   }
 
   void internalError({Token token, Node node}) {
     // TODO(ahe): This should call reporter.internalError.
     Spannable spannable = (token == null) ? node : token;
     throw new SpannableAssertionFailure(spannable, 'Internal error in parser.');
   }
 }