Skeleton typedef type implementation

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 457 matching lines @@
   Type computeType(Compiler compiler) => compiler.types.dynamicType;
 
   Token position() => firstPosition;
 
   PrefixElement cloneTo(Element enclosing, DiagnosticListener listener) {
     return new PrefixElement(name, enclosing, firstPosition);
   }
 }
 
 class TypedefElement extends Element implements TypeDeclarationElement {
-  Type cachedType;
   Typedef cachedNode;
+  TypedefType cachedType;
+  Type alias;
+
+  bool isResolved = false;

[ahe, 2012/08/16 13:22:58]

Can you use states instead as I do in ClassElement?

[Johnni Winther, 2012/08/17 11:15:19]

I will do that in a later CL.

+  bool isBeingResolved = false;
 
   TypedefElement(SourceString name, Element enclosing)
       : super(name, ElementKind.TYPEDEF, enclosing);
 
-  Type computeType(Compiler compiler) {
+  /**
+   * Function signature for a typedef of a function type. The signature is
+   * kept to provide full information about parameter names through the mirror
+   * system.
+   *
+   * The [functionSignature] is not available until the typedef element has been
+   * resolved.

[ahe, 2012/08/16 13:22:58]

How do you resolve a typedef element?

[Johnni Winther, 2012/08/17 11:15:19]

Currently `compiler.resolveTypedef(this)`. I will change it use the
[ensureResolved] scheme in a later CL.

[ahe, 2012/08/21 14:27:24]

I hoped you would include this explanation in the comment, not a direct reply.
I'll try to be more obvious about that.

+   */
+  FunctionSignature functionSignature;
+
+  TypedefType computeType(Compiler compiler) {
     if (cachedType !== null) return cachedType;
-    cachedType = new FunctionType(null, null, this);
-    cachedType.initializeFrom(
-        compiler.computeFunctionType(this, compiler.resolveTypedef(this)));
+    Typedef node = parseNode(compiler);
+    Link<Type> parameters =
+        TypeDeclarationElement.createTypeVariables(this, node.typeParameters);
+    cachedType = new TypedefType(this, parameters);
+    compiler.resolveTypedef(this);
     return cachedType;
   }
 
-  Link<Type> get typeVariables() => const EmptyLink<Type>();
+  Link<Type> get typeVariables() => cachedType.typeArguments;
 
   Scope buildScope() =>
       new TypeDeclarationScope(enclosingElement.buildScope(), this);
 
   TypedefElement cloneTo(Element enclosing, DiagnosticListener listener) {
     TypedefElement result = new TypedefElement(name, enclosing);
     return result;
   }
 }
 
@@ skipping 132 matching lines @@
     }
     assert(type != null);
     return type;
   }
 
   Token position() => cachedNode.getBeginToken();
 
   VariableListElement cloneTo(Element enclosing, DiagnosticListener listener) {
     VariableListElement result;
     if (cachedNode !== null) {
-      result = new VariableListElement(cachedNode, kind, enclosing);
+      result = new VariableListElement.node(cachedNode, kind, enclosing);
     } else {
       result = new VariableListElement(kind, modifiers, enclosing);
     }
     return result;
   }
 }
 
 class ForeignElement extends Element {
   ForeignElement(SourceString name, ContainerElement enclosingElement)
     : super(name, ElementKind.FOREIGN, enclosingElement);
@@ skipping 752 matching lines @@
     : super(name, ElementKind.TYPE_VARIABLE, enclosing);
 
   TypeVariableType computeType(compiler) => type;
 
   Node parseNode(compiler) => cachedNode;
 
   String toString() => "${enclosingElement.toString()}.${name.slowToString()}";
 
   TypeVariableElement cloneTo(Element enclosing, DiagnosticListener listener) {
     TypeVariableElement result =
-        new TypeVariableElement(name, enclosing, node, type, bound);
+        new TypeVariableElement(name, enclosing, cachedNode, type, bound);
     return result;
   }
 }