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 155 matching lines @@
 
   Element getOutermostEnclosingMemberOrTopLevel() {
     for (Element e = this; e !== null; e = e.enclosingElement) {
       if (e.isMember() || e.isTopLevel()) {
         return e;
       }
     }
     return null;
   }
 
+  /**
+   * Creates the scope for this element. The scope of the
+   * enclosing element will be the parent scope.
+   */
+  Scope buildScope() => buildEnclosingScope();
+
+  /**
+   * Creates the scope for the enclosing element. The scope of the
+   * enclosing element will be the parent scope.

[ahe, 2012/08/02 06:43:14]

Could you explain what the difference between these two scopes is?

+   */
+  Scope buildEnclosingScope() => enclosingElement.buildScope();
+
   String toString() {
     // TODO(johnniwinther): Test for nullness of name, or make non-nullness an
     // invariant for all element types?
     var nameText = name !== null ? name.slowToString() : '?';
     if (enclosingElement !== null && !isTopLevel()) {
       String holderName = enclosingElement.name !== null
           ? enclosingElement.name.slowToString()
           : '${enclosingElement.kind}?';
       return '$kind($holderName#${nameText})';
     } else {
@@ skipping 160 matching lines @@
    */
   String getLibraryOrScriptName() {
     if (libraryTag !== null) {
       return libraryTag.argument.dartString.slowToString();
     } else {
       // Use the file name as script name.
       var path = script.uri.path;
       return path.substring(path.lastIndexOf('/') + 1);
     }
   }
+
+  Scope buildEnclosingScope() => new TopScope(this);
 }
 
 class PrefixElement extends Element {
   Map<SourceString, Element> imported;
   Token firstPosition;
   final CompilationUnitElement patchSource;
 
   PrefixElement(SourceString prefix, Element enclosing, this.firstPosition,
                 [this.patchSource])
     : imported = new Map<SourceString, Element>(),
       super(prefix, ElementKind.PREFIX, enclosing);
 
   CompilationUnitElement getCompilationUnit() {
     if (patchSource !== null) return patchSource;
     return super.getCompilationUnit();
   }
 
   lookupLocalMember(SourceString memberName) => imported[memberName];
 
   Type computeType(Compiler compiler) => compiler.types.dynamicType;
 
   Token position() => firstPosition;
 }
 
-class TypedefElement extends Element {
-  Type cachedType;
+class TypedefElement extends Element implements TypeDeclarationElement {
+  TypedefElement(SourceString name, Element enclosing)
+    : super(name, ElementKind.TYPEDEF, enclosing);
+
+  TypedefType cachedType;
+  Type alias;
   Typedef cachedNode;
 
-  TypedefElement(SourceString name, Element enclosing)
-      : super(name, ElementKind.TYPEDEF, enclosing);
+  /**
+   * 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.
+   */
+  FunctionSignature functionSignature;
 
-  Type computeType(Compiler compiler) {
-    if (cachedType !== null) return cachedType;
-    cachedType = compiler.computeFunctionType(
-        this, compiler.resolveTypedef(this));
+  TypedefType computeType(Compiler compiler) {
+    if (cachedType == null) {
+      Typedef node = parseNode(compiler);
+      Link<TypeVariableType> parameters =
+          createTypeVariables(this, node.typeParameters);

[ahe, 2012/08/02 06:43:14]

How about adding:

assert(cachedType === null);

+      cachedType = new TypedefType(this, parameters);
+    }
     return cachedType;
   }
+
+
+  Link<TypeVariableType> get typeVariables() => cachedType.typeArguments;
+
+  Scope buildScope() =>
+      new TypeDeclarationScope(enclosingElement.buildScope(), this);
 }
 
 class VariableElement extends Element {
   final VariableListElement variables;
   Expression cachedNode; // The send or the identifier in the variables list.
 
   Modifiers get modifiers() => variables.modifiers;
 
   VariableElement(SourceString name,
                   VariableListElement this.variables,
@@ skipping 54 matching lines @@
 // It contains the node, and the type. A [VariableElement] always
 // references its [VariableListElement]. It forwards its
 // [computeType] and [parseNode] methods to this element.
 class VariableListElement extends Element {
   VariableDefinitions cachedNode;
   Type type;
   final Modifiers modifiers;
 
   /**
    * Function signature for a variable with a function type. The signature is
-   * kept to provide full information about parameter names through the the
-   * mirror system.
+   * kept to provide full information about parameter names through the mirror
+   * system.
    */
   FunctionSignature functionSignature;
 
   VariableListElement(ElementKind kind,
                       Modifiers this.modifiers,
                       Element enclosing)
     : super(null, kind, enclosing);
 
   VariableListElement.node(VariableDefinitions node,
                            ElementKind kind,
@@ skipping 86 matching lines @@
           getter.modifiers.nodes,
           getter.modifiers.flags | Modifiers.FLAG_ABSTRACT);
     } else {
       return new Modifiers.withFlags(
           setter.modifiers.nodes,
           setter.modifiers.flags | Modifiers.FLAG_ABSTRACT);
     }
   }
 }
 
+// TODO(johnniwinther): [FunctionSignature] should be merged with
+// [FunctionType].
 class FunctionSignature {
   Link<Element> requiredParameters;
   Link<Element> optionalParameters;
   Type returnType;
   int requiredParameterCount;
   int optionalParameterCount;
   FunctionSignature(this.requiredParameters,
                     this.optionalParameters,
                     this.requiredParameterCount,
                     this.optionalParameterCount,
@@ skipping 178 matching lines @@
 class VoidElement extends Element {
   VoidElement(Element enclosing)
       : super(const SourceString('void'), ElementKind.VOID, enclosing);
   Type computeType(compiler) => compiler.types.voidType;
   Node parseNode(_) {
     throw 'internal error: parseNode on void';
   }
   bool impliesType() => true;
 }
 
-class ClassElement extends ContainerElement {
+/**
+ * [TypeDeclarationElement] defines the common interface for class/interface
+ * declarations and typedefs.
+ */
+interface TypeDeclarationElement extends Element {
+  /**
+   * The type variables declared on this declaration. The type variables are not
+   * available until the type of the element has been computed through
+   * [computeType].
+   */
+  // TODO(johnniwinther): Find a (better) way to decouple [typeVariables] from
+  // [Compiler].
+  final Link<TypeVariableType> typeVariables;
+}
+
+/**
+ * Creates the type variables, their type and corresponding element, for the
+ * type variables declared in [parameter] on [element]. The bounds of the type
+ * variables are not set until [element] has been resolved.
+ */
+Link<TypeVariableType> createTypeVariables(TypeDeclarationElement element,
+                                           NodeList parameters) {
+  if (parameters === null) return const EmptyLink<TypeVariableType>();
+
+  // Create types and elements for type variable.
+  var arguments = new LinkBuilder<TypeVariableType>();
+  for (Link<Node> link = parameters.nodes; !link.isEmpty(); link = link.tail) {
+    TypeVariable typeNode = link.head;
+    SourceString variableName = typeNode.name.source;
+    TypeVariableType variableType = new TypeVariableType(variableName);
+    arguments.addLast(variableType);
+    TypeVariableElement variableElement =
+        new TypeVariableElement(variableName, element, typeNode, variableType);
+    variableType.element = variableElement;
+  }
+  return arguments.toLink();
+}
+
+/**
+ * Looks up [name] within the type variables declared in [element].
+ */
+Element lookupTypeVariable(TypeDeclarationElement element,
+                           SourceString name) {
+  Link<TypeVariableType> typeVariableLink = element.typeVariables;
+  while (!typeVariableLink.isEmpty()) {
+    TypeVariableType typeVariable = typeVariableLink.head;
+    if (typeVariable.name == name) {
+      return typeVariable.element;
+    }
+    typeVariableLink = typeVariableLink.tail;
+  }
+  return null;
+}
+

[ahe, 2012/08/02 06:43:14]

Extra line.

+
+class ClassElement extends ContainerElement
+    implements TypeDeclarationElement {
   final int id;
-  Type type;
-  Type supertype;
-  Type defaultClass;
+  InterfaceType type;
+  InterfaceType supertype;

[ahe, 2012/08/02 06:43:14]

Eventually an interface may extend a typedef. So I would prefer to use Type
here.

Generally, I would prefer everything but "type" remained loosely typed. It would
be useful to have an erroneous later, so flexibility is good.

+  InterfaceType defaultClass;
   Link<Element> members = const EmptyLink<Element>();
   Map<SourceString, Element> localMembers;
   Map<SourceString, Element> constructors;
-  Link<Type> interfaces = const EmptyLink<Type>();
-  LinkedHashMap<SourceString, TypeVariableElement> typeParameters;
+  Link<InterfaceType> interfaces = const EmptyLink<InterfaceType>();
   bool isResolved = false;
   bool isBeingResolved = false;
   // backendMembers are members that have been added by the backend to simplify
   // compilation. They don't have any user-side counter-part.
   Link<Element> backendMembers = const EmptyLink<Element>();
 
-  Link<Type> allSupertypes;
+  Link<InterfaceType> allSupertypes;
   ClassElement patch = null;
   Node defaultClause;  // Only for interfaces.
 
   ClassElement(SourceString name, CompilationUnitElement enclosing, this.id)
     : localMembers = new Map<SourceString, Element>(),
       constructors = new Map<SourceString, Element>(),
-      typeParameters = new LinkedHashMap<SourceString, TypeVariableElement>(),
       super(name, ElementKind.CLASS, enclosing);
 
   void addMember(Element element, DiagnosticListener listener) {
     members = members.prepend(element);
     if (element.kind == ElementKind.GENERATIVE_CONSTRUCTOR ||
         element.modifiers.isFactory()) {
       constructors[element.name] = element;
     } else if (element.kind == ElementKind.GETTER
                || element.kind == ElementKind.SETTER) {
       addGetterOrSetter(element, localMembers[element.name], listener);
     } else {
       localMembers[element.name] = element;
     }
   }
 
-  Type computeType(compiler) {
-    if (type === null) {
-      type = new InterfaceType(this);
+  InterfaceType computeType(compiler) {
+    if (type == null) {
+      ClassNode node = parseNode(compiler);
+      Link<TypeVariableType> parameters =
+          createTypeVariables(this, node.typeParameters);
+      type = new InterfaceType(this, parameters);
     }
     return type;
   }
 
+  Link<TypeVariableType> get typeVariables() => type.typeArguments;

[ahe, 2012/08/02 06:43:14]

Same applies here, so I would prefer Link<Type>.

+
   ClassElement ensureResolved(Compiler compiler) {
     compiler.resolveClass(this);
     return this;
   }
 
-  Element lookupTypeParameter(SourceString parameterName) {
-    Element result = typeParameters[parameterName];
-    return result;
-  }
-
   Element lookupLocalMember(SourceString memberName) {
     return localMembers[memberName];
   }
 
   Element lookupSuperMember(SourceString memberName) {
     for (ClassElement s = superclass; s != null; s = s.superclass) {
       Element e = s.lookupLocalMember(memberName);
       if (e === null) continue;
       // Private members from a different library are not visible.
       if (memberName.isPrivate() && getLibrary() !== e.getLibrary()) continue;
@@ skipping 115 matching lines @@
     for (ClassElement s = this; s != null; s = s.superclass) {
       if (s === cls) return true;
     }
     return false;
   }
 
   bool isInterface() => false;
   bool isNative() => nativeName != null;
   SourceString nativeName;
   int hashCode() => id;
+
+  Scope buildScope() =>
+      new ClassScope(enclosingElement.buildScope(), this);
 }
 
 class Elements {
   static bool isLocal(Element element) {
     return ((element !== null)
             && !element.isInstanceMember()
             && !isStaticOrTopLevelField(element)
             && !isStaticOrTopLevelFunction(element)
             && (element.kind === ElementKind.VARIABLE ||
                 element.kind === ElementKind.PARAMETER ||
@@ skipping 158 matching lines @@
 
   Node parseNode(DiagnosticListener l) => statement;
 
   bool get isSwitch() => statement is SwitchStatement;
 
   Token position() => statement.getBeginToken();
   String toString() => statement.toString();
 }
 
 class TypeVariableElement extends Element {
-  final Node node;
+  final Node cachedNode;
   Type bound;
-  Type type;
-  TypeVariableElement(name, Element enclosing, this.node, this.type,
+  TypeVariableType type;
+
+  TypeVariableElement(name, Element enclosing, this.cachedNode, this.type,
                       [this.bound])
     : super(name, ElementKind.TYPE_VARIABLE, enclosing);
-  Type computeType(compiler) => type;
-  Node parseNode(compiler) => node;
-  toString() => "${enclosingElement.toString()}.${name.slowToString()}";
+
+  TypeVariableType computeType(compiler) => type;
+
+  Node parseNode(compiler) => cachedNode;
+
+  String toString() => "${enclosingElement.toString()}.${name.slowToString()}";

[ahe, 2012/08/02 06:43:14]

This change is fine, but am I the only one thinking this return type is a bit
redundant?

 }