Bring type variables into static scope, but produce compile-time error when they are used.

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');
 
 #import('../tree/tree.dart');
 #import('../scanner/scannerlib.dart');
@@ skipping 323 matching lines @@
     }
   }
 
   bool _isNative = false;
   void setNative() { _isNative = true; }
   bool isNative() => _isNative;
 
   FunctionElement asFunctionElement() => null;
 
   static bool isInvalid(Element e) => e == null || e.isErroneous();
+
+  bool inStaticContext() {
+    return modifiers !== null && modifiers.isStatic();

[ahe, 2012/10/04 07:51:02]

Didn't Johnni land a change that ensures modifiers are non-null?

[aam-me, 2012/10/10 02:48:40]

Done.

+  }
+
   Element cloneTo(Element enclosing, DiagnosticListener listener) {
     listener.cancel("Unimplemented cloneTo", element: this);
   }
 }
 
 /**
  * Represents an unresolvable or duplicated element.
  *
  * An [ErroneousElement] is used instead of [null] to provide additional
  * information about the error that caused the element to be unresolvable
@@ skipping 565 matching lines @@
     } else {
       result = new VariableListElement(kind, modifiers, enclosing);
     }
     return result;
   }
 
   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;
+  bool inStaticContext() {
+    return super.inStaticContext() || enclosingElement.inStaticContext();
   }
 }
 
 class ForeignElement extends Element {
   ForeignElement(SourceString name, ContainerElement enclosingElement)
     : super(name, ElementKind.FOREIGN, enclosingElement);
 
   DartType computeType(Compiler compiler) {
     return compiler.types.dynamicType;
   }
@@ skipping 243 matching lines @@
       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,
@@ skipping 749 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }