Refactor resolution code in the vm to properly handle ambiguity errors.

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/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 1585 matching lines @@
 // Lookup class in the core lib which also contains various VM
 // helper methods and classes. Allow look up of private classes.
 static RawClass* LookupCoreClass(const String& class_name) {
   const Library& core_lib = Library::Handle(Library::CoreLibrary());
   String& name = String::Handle(class_name.raw());
   if (class_name.CharAt(0) == Scanner::kPrivateIdentifierStart) {
     // Private identifiers are mangled on a per script basis.
     name = String::Concat(name, String::Handle(core_lib.private_key()));
     name = Symbols::New(name);
   }
-  return core_lib.LookupClass(name);
+  return core_lib.LookupClass(name, NULL);  // No ambiguity error expected.
 }
 
 
 static const String& PrivateCoreLibName(const String& str) {
   const Library& core_lib = Library::Handle(Library::CoreLibrary());
   const String& private_name = String::ZoneHandle(core_lib.PrivateName(str));
   return private_name;
 }
 
 
@@ skipping 1226 matching lines @@
              "static method '%s' cannot be abstract",
              method->name->ToCString());
   }
   if (method->has_const && !method->IsFactoryOrConstructor()) {
     ErrorMsg(method->name_pos, "'const' not allowed for methods");
   }
   if (method->has_abstract && method->IsFactoryOrConstructor()) {
     ErrorMsg(method->name_pos, "constructor cannot be abstract");
   }
   if (method->has_const && method->IsConstructor()) {
-    Class& cls = Class::Handle(library_.LookupClass(members->class_name()));
-    cls.set_is_const();
+    current_class().set_is_const();
   }
 
   // Parse the formal parameters.
   const bool are_implicitly_final = method->has_const;
   const bool allow_explicit_default_values = true;
   const intptr_t formal_param_pos = TokenPos();
   method->params.Clear();
   // Static functions do not have a receiver.
   // The first parameter of a factory is the AbstractTypeArguments vector of
   // the type of the instance to be allocated.
@@ skipping 5746 matching lines @@
   }
   accessor_name = Field::SetterName(name);
   obj = lib.LookupLocalObject(accessor_name);
   return obj.raw();
 }
 
 
 static RawObject* LookupNameInImport(Isolate* isolate,
                                      const Namespace& ns,
                                      const String& name) {
+  // If the given name is filtered out by the import, don't look it up, nor its
+  // getter and setter names.
+  if (ns.HidesName(name)) {
+    return Object::null();
+  }
   Object& obj = Object::Handle(isolate);
   obj = ns.Lookup(name);
   if (!obj.IsNull()) {
     return obj.raw();
   }
-  // If the given name is filtered out by the import, don't look up the
-  // getter and setter names.
-  if (ns.HidesName(name)) {
-    return Object::null();
-  }
   String& accessor_name = String::Handle(isolate, Field::GetterName(name));
   obj = ns.Lookup(accessor_name);
   if (!obj.IsNull()) {
     return obj.raw();
   }
   accessor_name = Field::SetterName(name);
   obj = ns.Lookup(accessor_name);
   return obj.raw();
 }
 
@@ skipping 1568 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart