Parse formal parameters.

dart/frog/leg/scanner/parser.dart

 // 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.
 
 /**
  * An event generating parser of Dart programs. This parser expects
  * all tokens in a linked list.
  */
 class Parser<L extends Listener> {
   final L listener;
@@ skipping 47 matching lines @@
     token = skipBlock(token);
     listener.endInterface(token);
     return token.next;
   }
 
   Token parseNamedFunctionAlias(Token token) {
     listener.beginFunctionTypeAlias(token);
     token = parseReturnTypeOpt(next(token));
     token = parseIdentifier(token);
     token = parseTypeVariablesOpt(token);
-    token = parseParameters(token);
+    token = parseFormalParameters(token);
     listener.endFunctionTypeAlias(token);
     return expect(';', token);
   }
 
   Token parseReturnTypeOpt(Token token) {
     if (token.stringValue === 'void') {
       listener.voidType(token);
       return next(token);
     } else {
       return parseTypeOpt(token);
     }
   }
 
-  Token parseParameters(Token token) {
+  Token parseFormalParameters(Token token) {
+    Token begin = token;
+    listener.beginFormalParameters(begin);
     expect('(', token);
-    if (optional(')', next(token))) {
-      return next(next(token));
+    int parameterCount = 0;
+    if (optional(')', token.next)) {
+      listener.endFormalParameters(parameterCount, begin, token.next);
+      return token.next.next;
     }
     do {
-      // TODO(ahe): Handle 'final' and 'var'.
+      listener.beginFormalParameter(token);
       token = parseTypeOpt(next(token));
       token = parseIdentifier(token);
+      listener.endFormalParameter(token);
+      ++parameterCount;
     } while (optional(',', token));
+    listener.endFormalParameters(parameterCount, begin, token);
     return expect(')', token);
   }
 
   Token parseTypeOpt(Token token) {
     final nextValue = token.next.stringValue;
     switch (true) {
       case nextValue === '<':
       case nextValue === '.':
       case isIdentifier(token.next):
         return parseType(token);
       default:
+        listener.handleNoType(token);
         return token;
     }
   }
 
   bool isIdentifier(Token token) {
     final kind = token.kind;
     switch (true) {
       case kind === IDENTIFIER_TOKEN:
         return true;
       case kind === KEYWORD_TOKEN:
@@ skipping 223 matching lines @@
   Token parseFunction(Token token) {
     listener.beginFunction(token);
     token = parseReturnTypeOpt(token);
     listener.beginFunctionName(token);
     token = parseIdentifier(token);
     listener.endFunctionName(token);
     token = parseFormalParameters(token);
     return parseFunctionBody(token);
   }
 
-  Token parseFormalParameters(Token token) {
-    Token begin = token;
-    listener.beginFormalParameters(begin);
-    expect('(', token);
-    int parameterCount = 0;
-    if (optional(')', token.next)) {
-      listener.endFormalParameters(parameterCount, begin, token.next);
-      return token.next.next;
-    }
-    do {
-      token = parseType(next(token)); // TODO(ahe): Types are optional.
-      token = parseIdentifier(token);
-      ++parameterCount;
-    } while (optional(',', token));
-    listener.endFormalParameters(parameterCount, begin, token);
-    return expect(')', token);
-  }
-
   Token parseFunctionBody(Token token) {
     if (optional(';', token)) {
       listener.endFunctionBody(0, null, token);
       return token.next;
     }
     // TODO(ahe): Handle '=>' syntax.
     Token begin = token;
     int statementCount = 0;
     listener.beginFunctionBody(begin);
     token = checkEof(expect('{', token));
@@ skipping 298 matching lines @@
     int statementCount = 0;
     token = expect('{', token);
     while (!optional('}', token)) {
       token = parseStatement(token);
       ++statementCount;
     }
     listener.endBlock(statementCount, begin, token);
     return expect('}', token);
   }
 }