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 324 matching lines @@
       return '$kind(${nameText})';
     }
   }
 
   bool _isNative = false;
   void setNative() { _isNative = true; }
   bool isNative() => _isNative;
 
   FunctionElement asFunctionElement() => null;
 
+  bool inStaticContext() {
+    return modifiers !== null && modifiers.isStatic();
+  }
+
   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 494 matching lines @@
     } else {
       result = new VariableListElement(kind, modifiers, enclosing);
     }
     return result;
   }
 
   bool isInstanceMember() {
     return isMember() && !modifiers.isStatic();
   }
 
+  bool inStaticContext() {
+    return super.inStaticContext() || enclosingElement.inStaticContext();
+  }
+
   Scope buildScope() {
-    Scope result = new VariableScope(enclosingElement.buildScope(), this);
-    if (enclosingElement.isClass()) {
-      ClassScope clsScope = result.parent;
-      clsScope.inStaticContext = !isInstanceMember();
-    }
-    return result;
+    return new VariableScope(enclosingElement.buildScope(), this);
   }
 }
 
 class ForeignElement extends Element {
   ForeignElement(SourceString name, ContainerElement enclosingElement)
     : super(name, ElementKind.FOREIGN, enclosingElement);
 
   DartType computeType(Compiler compiler) {
     return compiler.types.dynamicType;
   }
@@ skipping 241 matching lines @@
   String toString() {
     if (isPatch) {
       return 'patch ${super.toString()}';
     } else if (isPatched) {
       return 'origin ${super.toString()}';
     } else {
       return super.toString();
     }
   }
 
   Scope buildScope() {

[Johnni Winther, 2012/10/02 09:07:30]

Remove this method. MethodScope is mutable and should only be created in the
ResolverVisitor. 

[aam-me, 2012/10/02 12:50:39]

Johnni,

  removing this method causes "Internal error: Cannot add an element in a class
scope" as in below. Did I miss something? Please, advise. Thanks!

===
C:\dart_bleeding\dart-repo.9\dart>tools\test.py -mrelease -cdart2js -rd8
co19/Language/03_Overview/1_Scoping_A02_t05
Test configuration: dart2js_d8_release_ia32
[00:00 |  --% | +    0 | -    0]
FAILED: dart2js-d8 release_ia32 co19/Language/03_Overview/1_Scoping_A02_t05
Expected: pass
Actual: crash
Unexpected compile-time error.

stdout:
lib/core/expect.dart:70:15: Error: The compiler crashed when compiling this
element.
  static void fail(String msg) {
              ^^^^
The compiler is broken.

...

Internal error: Cannot add an element in a class scope
#0      ClassScope.add
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/resolver.dart:2854:5)
#1      ResolverVisitor.defineElement
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/resolver.dart:1118:35)
#2      ResolverVisitor.setupFunction.<anonymous closure>
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/resolver.dart:1167:22)
#3      FunctionSignature.forEachRequiredParameter
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/elements/elements.dart:963:15)
#4      FunctionSignature.forEachParameter
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/elements/elements.dart:988:29)
#5      ResolverVisitor.setupFunction
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/resolver.dart:1154:40)
#6      ResolverTask.resolveMethodElement.<anonymous closure>
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/resolver.dart:148:28)
#7      Compiler.withCurrentElement
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/compiler.dart:135:15)
#8      Compiler.withCurrentElement
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/compiler.dart:148:7)
#9      ResolverTask.resolveMethodElement
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/resolver.dart:131:39)
#10     ResolverTask.resolve.<anonymous closure>
(file:///C:/dart_bleeding/dart-repo.9/dart/lib/compiler/implementation/resolver.dart:73:36)
...
===

[Johnni Winther, 2012/10/03 10:40:33]

OK. Just leave it there. I'll try to remove it in another CL.

-    Scope result =
-        new MethodScope(enclosingElement.buildScope(), this);
-    if (enclosingElement.isClass()) {
-      Scope clsScope = result.parent;
-      clsScope.inStaticContext = !isInstanceMember() && !isConstructor();
-    }
-    return result;
+    return new MethodScope(enclosingElement.buildScope(), this);
   }
 }
 
 class ConstructorBodyElement extends FunctionElement {
   FunctionElement constructor;
 
   ConstructorBodyElement(FunctionElement constructor)
       : this.constructor = constructor,
         super(constructor.name,
               ElementKind.GENERATIVE_CONSTRUCTOR_BODY,
@@ skipping 686 matching lines @@
 
   MetadataAnnotation ensureResolved(Compiler compiler) {
     if (resolutionState == STATE_NOT_STARTED) {
       compiler.resolver.resolveMetadataAnnotation(this);
     }
     return this;
   }
 
   String toString() => 'MetadataAnnotation($value, $resolutionState)';
 }