Resolve typedefs.

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 20 matching lines @@
 
   static final int ALIAS = 32;
 
   static final int SUPER = 64;
 
   /** Type variable */
   static final int TYPE_VARIABLE = 128;
 
   static final int IMPLIES_TYPE = CLASS | ALIAS | TYPE_VARIABLE;
 
-  static final int IS_EXTENDABLE = CLASS | ALIAS;
+  static final int IS_EXTENDABLE = CLASS;
 }
 
 class ElementKind {
   final String id;
   final int category;
 
   const ElementKind(String this.id, this.category);
 
   static final ElementKind VARIABLE =
     const ElementKind('variable', ElementCategory.VARIABLE);
@@ skipping 139 matching lines @@
     return element;
   }
 
   ClassElement getEnclosingClass() {
     for (Element e = this; e !== null; e = e.enclosingElement) {
       if (e.kind === ElementKind.CLASS) return e;
     }
     return null;
   }
 
+  Element getEnclosingClassOrTypedef() {
+    for (Element e = this; e !== null; e = e.enclosingElement) {
+      if (e.kind === ElementKind.CLASS
+          || e.kind === ElementKind.TYPEDEF) return e;

[ahe, 2012/07/30 10:30:05]

I'd prefer if you keep the condition on the same line and the return on a line
by itself (preferably wrapped in curly braces).

[Johnni Winther, 2012/08/01 10:12:28]

Removed.

+    }
+    return null;
+  }
+
   Element getEnclosingMember() {
     for (Element e = this; e !== null; e = e.enclosingElement) {
       if (e.isMember()) return e;
     }
     return null;
   }
 
   Element getOutermostEnclosingMemberOrTopLevel() {
     for (Element e = this; e !== null; e = e.enclosingElement) {
       if (e.isMember() || e.isTopLevel()) {
@@ skipping 201 matching lines @@
   }
 
   lookupLocalMember(SourceString memberName) => imported[memberName];
 
   Type computeType(Compiler compiler) => compiler.types.dynamicType;
 
   Token position() => firstPosition;
 }
 
 class TypedefElement extends Element {
+  TypedefElement(SourceString name, Element enclosing)
+    : typeParameters = new LinkedHashMap<SourceString, TypeVariableElement>(),
+      super(name, ElementKind.TYPEDEF, enclosing);
+
+  LinkedHashMap<SourceString, TypeVariableElement> typeParameters;

[ahe, 2012/07/30 10:30:05]

I don't think this should be a map. The overhead of using a map is huge and in
99% of the cases it will contain less than two elements.

[Johnni Winther, 2012/08/01 10:12:28]

Done.

+
   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));
+    compiler.resolveTypedef(this);

[ahe, 2012/07/30 10:30:05]

This method may be called twice. You need to ensure that cachedType only is
assigned once and not by side-effect. I'm having a hard time seeing that
cachedType is only assigned once.

[Johnni Winther, 2012/08/01 10:12:28]

Done.

     return cachedType;
   }
 }
 
 class VariableElement extends Element {
   final VariableListElement variables;
   Expression cachedNode; // The send or the identifier in the variables list.
 
   Modifiers get modifiers() => variables.modifiers;
 
@@ skipping 770 matching lines @@
   final Node node;
   Type bound;
   TypeVariableType type;
   TypeVariableElement(name, Element enclosing, this.node, this.type,
                       [this.bound])
     : super(name, ElementKind.TYPE_VARIABLE, enclosing);
   TypeVariableType computeType(compiler) => type;
   Node parseNode(compiler) => node;
   toString() => "${enclosingElement.toString()}.${name.slowToString()}";
 }