Fix parsing of named parameters (issue 243).

runtime/vm/parser.cc

 // 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.
 
 #include "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 912 matching lines @@
 
 void Parser::ParseFormalParameterList(bool allow_explicit_default_values,
                                       ParamList* params) {
   TRACE_PARSER("ParseFormalParameterList");
   ASSERT(CurrentToken() == Token::kLPAREN);
 
   if (LookaheadToken(1) != Token::kRPAREN) {
     // Parse positional parameters.
     ParseFormalParameters(allow_explicit_default_values,
                           params);
-    if (CurrentToken() == Token::kLBRACK) {
-      ASSERT(!params->has_named_optional_parameters);
-      params->has_named_optional_parameters = true;
+    if (params->has_named_optional_parameters) {
       // Parse named optional parameters.
       ParseFormalParameters(allow_explicit_default_values,
                             params);
       if (CurrentToken() != Token::kRBRACK) {
         ErrorMsg("',' or ']' expected");
       }
       ExpectToken(Token::kRBRACK);
     }
     if ((CurrentToken() != Token::kRPAREN) &&
         !params->has_named_optional_parameters) {
       ErrorMsg("',' or ')' expected");
     }
   } else {
     ConsumeToken();
   }
   ExpectToken(Token::kRPAREN);
 }
 
 
 // Parses a sequence of normal or named formal parameters.
 void Parser::ParseFormalParameters(bool allow_explicit_default_values,
                                    ParamList* params) {
   TRACE_PARSER("ParseFormalParameters");
   do {
     ConsumeToken();
     if (!params->has_named_optional_parameters &&
         (CurrentToken() == Token::kLBRACK)) {
       // End of normal parameters, start of named parameters.
+      params->has_named_optional_parameters = true;
       return;
     }
     ParseFormalParameter(allow_explicit_default_values, params);
   } while (CurrentToken() == Token::kCOMMA);
 }
 
 
 String& Parser::ParseNativeDeclaration() {
   TRACE_PARSER("ParseNativeDeclaration");
   ASSERT(IsLiteral("native"));
@@ skipping 6045 matching lines @@
 }
 
 
 void Parser::SkipNestedExpr() {
   const bool saved_mode = SetAllowFunctionLiterals(true);
   SkipExpr();
   SetAllowFunctionLiterals(saved_mode);
 }
 
 }  // namespace dart