Remove VariableScope, Scope.lexicalLookup and Scope.inStaticContext

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('dart:uri');
 
 // TODO(ahe): Rename prefix to 'api' when VM bug is fixed.
 #import('../../compiler.dart', prefix: 'api_e');
@@ skipping 917 matching lines @@
     });
     assert(type != null);
     return type;
   }
 
   Token position() => cachedNode.getBeginToken();
 
   bool isInstanceMember() {
     return isMember() && !modifiers.isStatic();
   }
-
-  // TODO(johnniwinther): Rewrite to avoid the optional argument.
-  Scope buildScope({bool patchScope: false}) {
-    Scope result = new VariableScope(
-        enclosingElement.buildScope(patchScope: patchScope), this);
-    if (enclosingElement.isClass()) {
-      Scope clsScope = result.parent;
-      clsScope.inStaticContext = !isInstanceMember();
-    }
-    return result;
-  }
 }
 
 class ForeignElement extends Element {
   ForeignElement(SourceString name, ContainerElement enclosingElement)
     : super(name, ElementKind.FOREIGN, enclosingElement);
 
   DartType computeType(Compiler compiler) {
     return compiler.types.dynamicType;
   }
 
@@ skipping 227 matching lines @@
 
   String toString() {
     if (isPatch) {
       return 'patch ${super.toString()}';
     } else if (isPatched) {
       return 'origin ${super.toString()}';
     } else {
       return super.toString();
     }
   }
-
-  // TODO(johnniwinther): Rewrite to avoid the optional argument.
-  Scope buildScope({bool patchScope: false}) {
-    Scope result = new MethodScope(
-        enclosingElement.buildScope(patchScope: patchScope), this);
-    if (enclosingElement.isClass()) {
-      Scope clsScope = result.parent;
-      clsScope.inStaticContext = !isInstanceMember() && !isConstructor();
-    }
-    return result;
-  }
 }
 
 class ConstructorBodyElement extends FunctionElement {
   FunctionElement constructor;
 
   ConstructorBodyElement(FunctionElement constructor)
       : this.constructor = constructor,
         super(constructor.name,
               ElementKind.GENERATIVE_CONSTRUCTOR_BODY,
               Modifiers.EMPTY,
@@ skipping 747 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }