Fix top-level map literals

runtime/vm/parser.cc

 // Copyright (c) 2012, 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 "lib/invocation_mirror.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 9219 matching lines @@
                                  arguments);
 }
 
 
 static void AddKeyValuePair(GrowableArray<AstNode*>* pairs,
                             bool is_const,
                             AstNode* key,
                             AstNode* value) {
   if (is_const) {
     ASSERT(key->IsLiteralNode());
-    ASSERT(key->AsLiteralNode()->literal().IsString());
     const Instance& new_key = key->AsLiteralNode()->literal();
     for (int i = 0; i < pairs->length(); i += 2) {
       const Instance& key_i =
           (*pairs)[i]->AsLiteralNode()->literal();
       ASSERT(key_i.IsString());
       if (new_key.Equals(key_i)) {
         // Duplicate key found. The new value replaces the previously
         // defined value.
         (*pairs)[i + 1] = value;
         return;
@@ skipping 788 matching lines @@
   if (CurrentToken() == Token::kINDEX) {
     // Empty list literal.
     ConsumeToken();
     return;
   }
   ExpectToken(Token::kLBRACK);
   while (CurrentToken() != Token::kRBRACK) {
     SkipNestedExpr();
     if (CurrentToken() == Token::kCOMMA) {
       ConsumeToken();
+    } else {
+      break;
     }
   }
   ExpectToken(Token::kRBRACK);
 }
 
 
 void Parser::SkipMapLiteral() {
   ExpectToken(Token::kLBRACE);
-  while (CurrentToken() == Token::kSTRING) {
-    SkipStringLiteral();
+  while (CurrentToken() != Token::kRBRACE) {
+    SkipNestedExpr();
     ExpectToken(Token::kCOLON);
     SkipNestedExpr();
     if (CurrentToken() == Token::kCOMMA) {
       ConsumeToken();
+    } else {
+      break;
     }
   }
   ExpectToken(Token::kRBRACE);
 }
 
 
 void Parser::SkipActualParameters() {
   ExpectToken(Token::kLPAREN);
   while (CurrentToken() != Token::kRPAREN) {
     if (IsIdentifier() && (LookaheadToken(1) == Token::kCOLON)) {
@@ skipping 215 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart