Introduce AmbiguousElement

sdk/lib/_internal/compiler/implementation/resolution/members.dart

Index: sdk/lib/_internal/compiler/implementation/resolution/members.dart
diff --git a/sdk/lib/_internal/compiler/implementation/resolution/members.dart b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
index 1224e338ca355d43266ab8f56e97590d5f556d94..65f57e4af457eae2ac060f6ff8b1ff93b0c9ed1b 100644
--- a/sdk/lib/_internal/compiler/implementation/resolution/members.dart
+++ b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
@@ -1083,9 +1083,9 @@ class TypeResolver {
     DartType type;
     if (element == null) {
       onFailure(node, MessageKind.CANNOT_RESOLVE_TYPE, [node.typeName]);
-    } else if (element.isErroneous()) {
-      ErroneousElement error = element;
-      onFailure(node, error.messageKind, error.messageArguments);
+    } else if (element.isAmbiguous()) {
+      AmbiguousElement ambiguous = element;
+      onFailure(node, ambiguous.messageKind, ambiguous.messageArguments);
     } else if (!element.impliesType()) {
       onFailure(node, MessageKind.NOT_A_TYPE, [node.typeName]);
     } else {
@@ -1241,17 +1241,9 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
                                                  SourceString name,
                                                  MessageKind kind,
                                                  List<Node> arguments) {
-    return warnOnErroneousElement(node,
-        new ErroneousElement(kind, arguments, name, enclosingElement));
-  }
-
-  ErroneousElement warnOnErroneousElement(Node node,
-                                          ErroneousElement erroneousElement) {
-    ResolutionWarning warning =
-        new ResolutionWarning(erroneousElement.messageKind,
-                              erroneousElement.messageArguments);
+    ResolutionWarning warning = new ResolutionWarning(kind, arguments);
     compiler.reportWarning(node, warning);
-    return erroneousElement;
+    return new ErroneousElement(kind, arguments, name, enclosingElement);
   }
 
   Element visitIdentifier(Identifier node) {
@@ -1274,8 +1266,10 @@ class ResolverVisitor extends CommonResolverVisitor<Element> {
                                                   MessageKind.CANNOT_RESOLVE,
                                                   [node]);
         }
-      } else if (element.isErroneous()) {
-        element = warnOnErroneousElement(node, element);
+      } else if (element.isAmbiguous()) {
+        AmbiguousElement ambiguous = element;
+        element = warnAndCreateErroneousElement(node, node.source,
+            ambiguous.messageKind, ambiguous.messageArguments);

[karlklose, 2012/11/07 11:41:24]

I would prefer this formatting:
  warnAndCreateErroneousElement(node, node.source, ambiguous.messageKind,  
                                ambiguous.messageArguments);

[Johnni Winther, 2012/11/07 13:02:01]

Done.

       } else {
         if ((element.kind.category & allowedCategory) == 0) {
           // TODO(ahe): Improve error message. Need UX input.