Parse field modifiers.

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 {
   final Listener listener;
@@ skipping 76 matching lines @@
       }
       token = parseFormalParameter(token);
       ++parameterCount;
     } while (optional(',', token));
     listener.endFormalParameters(parameterCount, begin, token);
     return expect(')', token);
   }
 
   Token parseFormalParameter(Token token) {
     listener.beginFormalParameter(token);
-    if (optional('void', token)) {
-      // TODO(ahe): Validate that there are formal parameters.
-      token = parseReturnTypeOpt(token);
-    } else {
-      token = parseFinalVarOrTypeOpt(token);
-    }
+    token = parseModifiers(token);
+    // TODO(ahe): Validate that there are formal parameters if void.
+    token = parseReturnTypeOpt(token);
     Token thisKeyword = null;
     if (optional('this', token)) {
       thisKeyword = token;
       // TODO(ahe): Validate field initializers are only used in
       // constructors, and not for function-typed arguments.
       token = expect('.', token.next);
     }
     token = parseIdentifier(token);
     if (optional('(', token)) {
       token = parseFormalParameters(token);
@@ skipping 157 matching lines @@
     // TODO(ahe): Rename this method to parseTypeOrVar?
     Token begin = token;
     int identifierCount = 1;
     if (isIdentifier(token)) {
       token = parseIdentifier(token);
       while (optional('.', token)) {
         // TODO(ahe): Validate that there are at most two identifiers.
         token = parseIdentifier(token.next);
         ++identifierCount;
       }
-    } else if (optional('var', token)) {
-      listener.handleVarKeyword(token);
-      return token.next;
     } else {
       token = listener.expectedType(token);
     }
     token = parseTypeArgumentsOpt(token);
     listener.endType(identifierCount, begin, token);
     return token;
   }
 
   Token parseTypeArgumentsOpt(Token token) {
     return parseStuff(token,
@@ skipping 879 matching lines @@
   }
 
   Token parseVariablesDeclaration(Token token) {
     token = parseVariablesDeclarationNoSemicolon(token);
     return expectSemicolon(token);
   }
 
   Token parseVariablesDeclarationNoSemicolon(Token token) {
     int count = 1;
     listener.beginVariablesDeclaration(token);
-    token = parseFinalVarOrType(token);
+    token = parseModifiers(token);
+    token = parseTypeOpt(token);
     token = parseOptionallyInitializedIdentifier(token);
     while (optional(',', token)) {
       token = parseOptionallyInitializedIdentifier(token.next);
       ++count;
     }
     listener.endVariablesDeclaration(count, token);
     return token;
   }
 
   Token parseOptionallyInitializedIdentifier(Token token) {
     listener.beginInitializedIdentifier(token);
     token = parseIdentifier(token);
     token = parseVariableInitializerOpt(token);
     listener.endInitializedIdentifier();
     return token;
   }
 
-  Token parseFinalVarOrType(Token token) {
-    if ('final' === token.stringValue) {
-      listener.handleFinalKeyword(token);
-      return parseTypeOpt(token.next);
-    } else {
-      return parseType(token);
-    }
-  }
-
-  Token parseFinalVarOrTypeOpt(Token token) {
-    final String value = token.stringValue;
-    if ('final' === value) {
-      listener.handleFinalKeyword(token);
-      return parseTypeOpt(token.next);
-    } else {
-      return parseTypeOpt(token);
-    }
-  }
-
   Token parseIfStatement(Token token) {
     Token ifToken = token;
     listener.beginIfStatement(ifToken);
     token = expect('if', token);
     token = parseParenthesizedExpression(token);
     token = parseStatement(token);
     Token elseToken = null;
     if (optional('else', token)) {
       elseToken = token;
       token = parseStatement(token.next);
@@ skipping 182 matching lines @@
     }
     listener.handleContinueStatement(hasTarget, continueKeyword, token);
     return expectSemicolon(token);
   }
 
   Token parseEmptyStatement(Token token) {
     listener.handleEmptyStatement(token);
     return expectSemicolon(token);
   }
 }