Allow ambiguous Expect and ExpectException imports.

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 "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 8183 matching lines @@
     // imported libraries.
     String& first_lib_url = String::Handle();
     Namespace& import = Namespace::Handle();
     intptr_t num_imports = library_.num_imports();
     Object& imported_obj = Object::Handle();
     for (int i = 0; i < num_imports; i++) {
       import = library_.ImportAt(i);
       imported_obj = LookupNameInImport(import, name);
       if (!imported_obj.IsNull()) {
         const Library& lib = Library::Handle(import.library());
-        if (!first_lib_url.IsNull()) {
+        if (!first_lib_url.IsNull()

[regis, 2013/02/06 19:40:48]

I would add a TODO here to remove this temporary check.

[floitsch, 2013/02/11 17:59:32]

Yes. I will add a TODO(issue-number) once I have file the issue.

+            && (strcmp(name.ToCString(), "Expect") != 0)
+            && (strcmp(name.ToCString(), "ExpectException") != 0)) {
           // Found duplicate definition.
           Error& ambiguous_ref_error = Error::Handle();
           if (first_lib_url.raw() == lib.url()) {
             ambiguous_ref_error = FormatErrorMsg(
                 script_, ident_pos, "Error",
                 "ambiguous reference: "
                 "'%s' as library '%s' is imported multiple times",
                 name.ToCString(),
                 first_lib_url.ToCString());
           } else {
@@ skipping 1544 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart