Revert "Allow patch files to add top-level declarations to the patched library."

lib/compiler/implementation/elements/elements.dart

 // 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.
 
 #library('elements');
 
 #import('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
 #import('../leg.dart');  // TODO(karlklose): we only need type.
 #import('../util/util.dart');
@@ skipping 84 matching lines @@
   static final ElementKind VOID =
     const ElementKind('void', ElementCategory.NONE);
 
   toString() => id;
 }
 
 class Element implements Hashable {
   final SourceString name;
   final ElementKind kind;
   final Element enclosingElement;
-  Script scriptOverride = null;
   Link<Node> metadata = const EmptyLink<Node>();
   Modifiers get modifiers() => null;
 
   Node parseNode(DiagnosticListener listener) {
     listener.cancel("Internal Error: $this.parseNode", token: position());
   }
 
   Type computeType(Compiler compiler) {
     compiler.internalError("$this.computeType.", token: position());
   }
@@ skipping 53 matching lines @@
 
   Element(this.name, this.kind, this.enclosingElement) {
     assert(getLibrary() !== null);
   }
 
   // TODO(kasperl): This is a very bad hash code for the element and
   // there's no reason why two elements with the same name should have
   // the same hash code. Replace this with a simple id in the element?
   int hashCode() => name.hashCode();
 
-  Script getScript() {
-    if (scriptOverride !== null) return scriptOverride;
-    return getCompilationUnit().script;
-  }
-
   CompilationUnitElement getCompilationUnit() {
     Element element = this;
     while (element !== null && !element.isCompilationUnit()) {
       element = element.enclosingElement;
     }
     return element;
   }
 
   LibraryElement getLibrary() {
     Element element = this;
@@ skipping 35 matching lines @@
     } else {
       return '$kind(${name.slowToString()})';
     }
   }
 
   bool _isNative = false;
   void setNative() { _isNative = true; }
   bool isNative() => _isNative;
 
   FunctionElement asFunctionElement() => null;
-
-  Element cloneTo(Element enclosing, DiagnosticListener listener) {
-    listener.cancel("Unimplemented cloneTo", element: this);
-  }
 }
 
 class ContainerElement extends Element {
   ContainerElement(name, kind, enclosingElement) :
     super(name, kind, enclosingElement);
 
   abstract void addMember(Element element, DiagnosticListener listener);
 
   void addGetterOrSetter(Element element,
                          Element existing,
@@ skipping 146 matching lines @@
       // Use the file name as script name.
       var path = script.uri.path;
       return path.substring(path.lastIndexOf('/') + 1);
     }
   }
 }
 
 class PrefixElement extends Element {
   Map<SourceString, Element> imported;
   Token firstPosition;
+  final CompilationUnitElement patchSource;
 
-  PrefixElement(SourceString prefix, Element enclosing, this.firstPosition)
-      : imported = new Map<SourceString, Element>(),
-        super(prefix, ElementKind.PREFIX, enclosing);
+  PrefixElement(SourceString prefix, Element enclosing, this.firstPosition,
+                [this.patchSource])
+    : imported = new Map<SourceString, Element>(),
+      super(prefix, ElementKind.PREFIX, enclosing);
+
+  CompilationUnitElement getCompilationUnit() {
+    if (patchSource !== null) return patchSource;
+    return super.getCompilationUnit();
+  }
 
   lookupLocalMember(SourceString memberName) => imported[memberName];
 
   Type computeType(Compiler compiler) => compiler.types.dynamicType;
 
   Token position() => firstPosition;
-
-  PrefixElement cloneTo(Element enclosing, DiagnosticListener listener) {
-    PrefixElement result = new PrefixElement(name, enclosing, firstPosition);
-    result.scriptOverride = getScript();
-    return result;
-  }
 }
 
 class TypedefElement extends Element {
   Type cachedType;
   Typedef cachedNode;
 
   TypedefElement(SourceString name, Element enclosing)
       : super(name, ElementKind.TYPEDEF, enclosing);
 
   Type computeType(Compiler compiler) {
     if (cachedType !== null) return cachedType;
     cachedType = compiler.computeFunctionType(
         this, compiler.resolveTypedef(this));
     return cachedType;
   }
-
-  TypedefElement cloneTo(Element enclosing, DiagnosticListener listener) {
-    TypedefElement result = new TypedefElement(name, enclosing);
-    result.scriptOverride = getScript();
-    return result;
-  }
 }
 
 class VariableElement extends Element {
   final VariableListElement variables;
   Expression cachedNode; // The send or the identifier in the variables list.
 
   Modifiers get modifiers() => variables.modifiers;
 
   VariableElement(SourceString name,
                   VariableListElement this.variables,
@@ skipping 26 matching lines @@
 
   Type get type() => variables.type;
 
   bool isInstanceMember() {
     return isMember() && !modifiers.isStatic();
   }
 
   // Note: cachedNode.getBeginToken() will not be correct in all
   // cases, for example, for function typed parameters.
   Token position() => findMyName(variables.position());
-
-  VariableElement cloneTo(Element enclosing, DiagnosticListener listener) {
-    VariableListElement clonedVariables =
-        variables.cloneTo(enclosing, listener);
-    VariableElement result = new VariableElement(
-        name, clonedVariables, kind, enclosing, cachedNode);
-    result.scriptOverride = getScript();
-    return result;
-  }
 }
 
 /**
  * Parameters in constructors that directly initialize fields. For example:
  * [:A(this.field):].
  */
 class FieldParameterElement extends VariableElement {
   VariableElement fieldElement;
 
   FieldParameterElement(SourceString name,
                         this.fieldElement,
                         VariableListElement variables,
                         Element enclosing,
                         Node node)
       : super(name, variables, ElementKind.FIELD_PARAMETER, enclosing, node);
-
-  FieldParameterElement cloneTo(Element enclosing,
-                                DiagnosticListener listener) {
-    FieldParameterElement result =
-      new FieldParameterElement(name, fieldElement,
-                                variables.cloneTo(enclosing, listener),
-                                enclosing, cachedNode);
-    result.scriptOverride = getScript();
-    return result;
-  }
 }
 
 // This element represents a list of variable or field declaration.
 // It contains the node, and the type. A [VariableElement] always
 // references its [VariableListElement]. It forwards its
 // [computeType] and [parseNode] methods to this element.
 class VariableListElement extends Element {
   VariableDefinitions cachedNode;
   Type type;
   final Modifiers modifiers;
@@ skipping 14 matching lines @@
     return cachedNode;
   }
 
   Type computeType(Compiler compiler) {
     if (type != null) return type;
     type = compiler.resolveTypeAnnotation(this, parseNode(compiler).type);
     return type;
   }
 
   Token position() => cachedNode.getBeginToken();
-
-  VariableListElement cloneTo(Element enclosing, DiagnosticListener listener) {
-    VariableListElement result;
-    if (cachedNode !== null) {
-      result = new VariableListElement(cachedNode, kind, enclosing);
-    } else {
-      result = new VariableListElement(kind, modifiers, enclosing);
-    }
-    result.scriptOverride = getScript();
-    return result;
-  }
 }
 
 class ForeignElement extends Element {
   ForeignElement(SourceString name, ContainerElement enclosingElement)
     : super(name, ElementKind.FOREIGN, enclosingElement);
 
   Type computeType(Compiler compiler) {
     return compiler.types.dynamicType;
   }
 
   parseNode(DiagnosticListener listener) {
     throw "internal error: ForeignElement has no node";
   }
-
-  ForeignElement cloneTo(Element enclosing, DiagnosticListener listener) {
-    ForeignElement result = new ForeignElement(name, kind, enclosing);
-    result.scriptOverride = getScript();
-    return result;
-  }
 }
 
 class AbstractFieldElement extends Element {
   FunctionElement getter;
   FunctionElement setter;
 
   AbstractFieldElement(SourceString name, Element enclosing)
       : super(name, ElementKind.ABSTRACT_FIELD, enclosing);
 
   Type computeType(Compiler compiler) {
@@ skipping 24 matching lines @@
     if (getter !== null) {
       return new Modifiers.withFlags(
           getter.modifiers.nodes,
           getter.modifiers.flags | Modifiers.FLAG_ABSTRACT);
     } else {
       return new Modifiers.withFlags(
           setter.modifiers.nodes,
           setter.modifiers.flags | Modifiers.FLAG_ABSTRACT);
     }
   }
-
-  AbstractFieldElement cloneTo(Element enclosing, DiagnosticListener listener) {
-    listener.cancel("Cannot clone synthetic AbstractFieldElement",
-                    element: this);
-  }
 }
 
 class FunctionSignature {
   Link<Element> requiredParameters;
   Link<Element> optionalParameters;
   Type returnType;
   int requiredParameterCount;
   int optionalParameterCount;
   FunctionSignature(this.requiredParameters,
                     this.optionalParameters,
@@ skipping 62 matching lines @@
   FunctionElement.tooMuchOverloading(SourceString name,
                                      FunctionExpression this.cachedNode,
                                      ElementKind kind,
                                      Modifiers this.modifiers,
                                      Element enclosing,
                                      FunctionSignature this.functionSignature)
       : super(name, kind, enclosing) {
     defaultImplementation = this;
   }
 
-  Script getScript() {
-    if (patch !== null) return patch.getScript();
-    return super.getScript();
+  CompilationUnitElement getCompilationUnit() {
+    if (patch !== null) return patch.getCompilationUnit();
+    return super.getCompilationUnit();
   }
 
   bool get isPatched() => patch !== null;
 
   /**
    * Applies a patch function to this function. The patch function's body
    * is used as replacement when parsing this function's body.
    * This method must not be called after the function has been parsed,
    * and it must be called at most once.
    */
@@ skipping 47 matching lines @@
       }
       return null;
     }
     cachedNode = patch.parseNode(listener);
     return cachedNode;
   }
 
   Token position() => cachedNode.getBeginToken();
 
   FunctionElement asFunctionElement() => this;
-
-  FunctionElement cloneTo(Element enclosing, DiagnosticListener listener) {
-    FunctionElement result = new FunctionElement.tooMuchOverloading(
-        name, cachedNode, kind, modifiers, enclosing, functionSignature);
-    result.defaultImplementation = defaultImplementation;
-    result.type = type;
-    result.scriptOverride = getScript();
-    return result;
-  }
 }
 
-
 class ConstructorBodyElement extends FunctionElement {
   FunctionElement constructor;
 
   ConstructorBodyElement(FunctionElement constructor)
       : this.constructor = constructor,
         super(constructor.name,
               ElementKind.GENERATIVE_CONSTRUCTOR_BODY,
               null,
               constructor.enclosingElement) {
     functionSignature = constructor.functionSignature;
   }
 
   bool isInstanceMember() => true;
 
   FunctionType computeType(Compiler compiler) {
     compiler.reportFatalError('Internal error: $this.computeType', this);
   }
 
   Node parseNode(DiagnosticListener listener) {
     if (cachedNode !== null) return cachedNode;
     cachedNode = constructor.parseNode(listener);
     assert(cachedNode !== null);
     return cachedNode;
   }
 
   Token position() => constructor.position();
-
-  ConstructorBodyElement cloneTo(Element enclosing,
-                                 DiagnosticListener listener) {
-    ConstructorBodyElement result =
-      new ConstructorBodyElement(constructor.cloneTo(enclosing, listener));
-    result.scriptOverride = getScript();
-    return result;
-  }
 }
 
 class SynthesizedConstructorElement extends FunctionElement {
   SynthesizedConstructorElement(Element enclosing)
     : super(enclosing.name, ElementKind.GENERATIVE_CONSTRUCTOR,
             null, enclosing);
 
   Token position() => enclosingElement.position();
-
-  SynthesizedConstructorElement cloneTo(Element enclosing,
-                                        DiagnosticListener listener) {
-    return new SynthesizedConstructorElement(enclosing);
-  }
 }
 
 class VoidElement extends Element {
   VoidElement(Element enclosing)
       : super(const SourceString('void'), ElementKind.VOID, enclosing);
   Type computeType(compiler) => compiler.types.voidType;
   Node parseNode(_) {
     throw 'internal error: parseNode on void';
   }
   bool impliesType() => true;
 }
 
 class ClassElement extends ContainerElement {
   final int id;
   Type type;
   Type supertype;
   Type defaultClass;
   Link<Element> members = const EmptyLink<Element>();
   Map<SourceString, Element> localMembers;
   Map<SourceString, Element> constructors;
   Link<Type> interfaces = const EmptyLink<Type>();
   LinkedHashMap<SourceString, TypeVariableElement> typeParameters;
-  SourceString nativeName;
   bool isResolved = false;
   bool isBeingResolved = false;
   // backendMembers are members that have been added by the backend to simplify
   // compilation. They don't have any user-side counter-part.
   Link<Element> backendMembers = const EmptyLink<Element>();
 
   Link<Type> allSupertypes;
+  ClassElement patch = null;
 
   ClassElement(SourceString name, CompilationUnitElement enclosing, this.id)
     : localMembers = new Map<SourceString, Element>(),
       constructors = new Map<SourceString, Element>(),
       typeParameters = new LinkedHashMap<SourceString, TypeVariableElement>(),
       super(name, ElementKind.CLASS, enclosing);
 
   void addMember(Element element, DiagnosticListener listener) {
     members = members.prepend(element);
     if (element.kind == ElementKind.GENERATIVE_CONSTRUCTOR ||
@@ skipping 150 matching lines @@
    */
   bool isSubclassOf(ClassElement cls) {
     for (ClassElement s = this; s != null; s = s.superclass) {
       if (s === cls) return true;
     }
     return false;
   }
 
   bool isInterface() => false;
   bool isNative() => nativeName != null;
+  SourceString nativeName;
   int hashCode() => id;
-
-  void cloneMembersTo(Element target, DiagnosticListener listener) {
-    target.type = type;
-    target.supertype = supertype;
-    target.defaultClass = defaultClass;
-    target.interfaces = interfaces;
-    target.typeParameters =
-        new LinkedHashMap<SourceString, TypeVariableElement>();
-    typeParameters.forEach((SourceString name, TypeVariableElement type) {
-      target.typeParameters[name] = type.cloneTo(target, listener);
-    });
-    target.nativeName = nativeName;
-    target.isResolved = isResolved;
-    target.isBeingResolved = isBeingResolved;
-    target.allSupertypes = allSupertypes;
-    if (!backendMembers.isEmpty()) {
-      listener.cancel("Cloning backend-modified class.", element: this);
-    }
-
-    Link<Element> elementList = this.members;
-    while (!elementList.isEmpty()) {
-      target.addMember(elementList.head.cloneTo(target, listener), listener);
-      elementList = elementList.tail;
-    }
-  }
-
-  ClassElement cloneTo(Element enclosing, DiagnosticListener listener) {
-    // TODO(lrn): Is copying id acceptable?
-    ClassElement result = new ClassElement(name, enclosing, id);
-    cloneMembersTo(result, listener);
-    result.scriptOverride = getScript();
-    return result;
-  }
 }
 
 class Elements {
   static bool isLocal(Element element) {
     return ((element !== null)
             && !element.isInstanceMember()
             && !isStaticOrTopLevelField(element)
             && !isStaticOrTopLevelFunction(element)
             && (element.kind === ElementKind.VARIABLE ||
                 element.kind === ElementKind.PARAMETER ||
@@ skipping 100 matching lines @@
         || (element == coreLibrary.find(const SourceString('Pattern')));
   }
 
   static bool isListSupertype(Element element, Compiler compiler) {
     LibraryElement coreLibrary = compiler.coreLibrary;
     return (element == coreLibrary.find(const SourceString('Collection')))
         || (element == coreLibrary.find(const SourceString('Iterable')));
   }
 }
 
+
 class LabelElement extends Element {
   // We store the original label here so it can be returned by [parseNode].
   final Label label;
   final String labelName;
   final TargetElement target;
   bool isBreakTarget = false;
   bool isContinueTarget = false;
   LabelElement(Label label, this.labelName, this.target,
                Element enclosingElement)
       : this.label = label,
@@ skipping 46 matching lines @@
 class TypeVariableElement extends Element {
   final Node node;
   Type bound;
   Type type;
   TypeVariableElement(name, Element enclosing, this.node, this.type,
                       [this.bound])
     : super(name, ElementKind.TYPE_VARIABLE, enclosing);
   Type computeType(compiler) => type;
   Node parseNode(compiler) => node;
   toString() => "${enclosingElement.toString()}.${name.slowToString()}";
-
-  TypeVariableElement cloneTo(Element enclosing, DiagnosticListener listener) {
-    TypeVariableElement result =
-        new TypeVariableElement(name, enclosing, node, type, bound);
-    result.scriptOverride = getScript();
-    return result;
-  }
 }