Implement parsing and resolving of type-variables.

frog/leg/resolver.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.
 
 interface TreeElements {
   Element operator[](Node node);
   Selector getSelector(Send send);
 }
 
 class TreeElementMapping implements TreeElements {
@@ skipping 182 matching lines @@
       visitor.visit(send.arguments.head);
     }
     return visitor.mapping;
   }
 
   Type resolveType(ClassElement element) {
     if (element.isResolved) return element.type;
     return measure(() {
       ClassNode tree = element.parseNode(compiler);
       ClassResolverVisitor visitor =
-        new ClassResolverVisitor(compiler, element.getLibrary());
+        new ClassResolverVisitor(compiler, element.getLibrary(), element);
       visitor.visit(tree);
       element.isResolved = true;
       return element.type;
     });
   }
 
   FunctionParameters resolveSignature(FunctionElement element) {
     return measure(() => SignatureResolver.analyze(compiler, element));
   }
 
@@ skipping 236 matching lines @@
   Link<TargetElement> continueTargetStack;
   // Used to provide different numbers to statements if one is inside the other.
   // Can be used to make otherwise duplicate labels unique.
   int nestingLevel = 0;
 
   StatementScope()
       : labels = const EmptyLabelScope(),
         breakTargetStack = const EmptyLink<TargetElement>(),
         continueTargetStack = const EmptyLink<TargetElement>();
 
-  LabelElement lookupLabel(String label) =>
-      labels.lookup(label);
-
+  LabelElement lookupLabel(String label) {
+    return labels.lookup(label);

[ngeoffray, 2012/03/18 13:40:57]

Why this change?

+  }
   TargetElement currentBreakTarget() =>
     breakTargetStack.isEmpty() ? null : breakTargetStack.head;
 
   TargetElement currentContinueTarget() =>
     continueTargetStack.isEmpty() ? null : continueTargetStack.head;
 
   void enterLabelScope(LabelElement element) {
     labels = new LabeledStatementLabelScope(labels, element);
     nestingLevel++;
   }
@@ skipping 67 matching lines @@
                                      statementScope.nestingLevel,
                                      enclosingElement);
       mapping[statement] = element;
     }
     return element;
   }
 
   inStaticContext(action()) {
     bool wasInstanceContext = inInstanceContext;
     inInstanceContext = false;
-    action();
+    var result = action();
     inInstanceContext = wasInstanceContext;
+    return result;
   }
 
   visitInStaticContext(Node node) {
     inStaticContext(() => visit(node));
   }
 
   Element visitIdentifier(Identifier node) {
     if (node.isThis()) {
       if (!inInstanceContext) {
         error(node, MessageKind.NO_INSTANCE_AVAILABLE, [node]);
@@ skipping 387 matching lines @@
       // TODO(ngeoffray): resolution error with wrong number of
       // parameters. We cannot do this rigth now because of the
       // List constructor.
     }
     useElement(node.send, constructor);
     return null;
   }
 
   FunctionElement resolveConstructor(NewExpression node) {
     FunctionElement constructor =
-      node.accept(new ConstructorResolver(compiler, this));
+        node.accept(new ConstructorResolver(compiler, this));
     if (constructor === null) {
-      error(node.send, MessageKind.CANNOT_FIND_CONSTRUCTOR, [node.send]);
+      Element resolved = resolveTypeRequired(node.send.selector);
+      if (resolved !== null && resolved.kind === ElementKind.TYPE_VARIABLE) {
+        error(node, WarningKind.TYPE_VARIABLE_AS_CONSTRUCTOR);
+        return null;
+      } else {
+        error(node.send, MessageKind.CANNOT_FIND_CONSTRUCTOR, [node.send]);
+      }
     }
     return constructor;
   }
 
   Element resolveTypeRequired(Node node) {
     bool old = typeRequired;
     typeRequired = true;
     Element element = visit(node);
     typeRequired = old;
     return element;
@@ skipping 217 matching lines @@
     visitIn(node.block, scope);
   }
 
   visitTypedef(Typedef node) {
     unimplemented(node, 'typedef');
   }
 }
 
 class ClassResolverVisitor extends CommonResolverVisitor<Type> {
   Scope context;
+  ClassElement classElement;
 
-  ClassResolverVisitor(Compiler compiler, LibraryElement library)
+  ClassResolverVisitor(Compiler compiler, LibraryElement library,
+                       ClassElement this.classElement)
     : context = new TopScope(library),
       super(compiler);
 
   Type visitClassNode(ClassNode node) {
-    ClassElement element = context.lookup(node.name.source);
-    compiler.ensure(element !== null);
-    compiler.ensure(!element.isResolved);
-    element.supertype = visit(node.superclass);
-    if (element.name != Types.OBJECT && element.supertype === null) {
+    compiler.ensure(classElement !== null);
+    compiler.ensure(!classElement.isResolved);
+    final Link<TypeVariable> parameters =
+        node.typeParameters !== null ? node.typeParameters.nodes
+                                     : const EmptyLink<TypeVariable>();
+    // Create types and elements for type variable.

[ngeoffray, 2012/03/18 13:40:57]

Please explain why you are doing two loops instead of one.

+    for (Link<TypeVariable> link = parameters;
+         !link.isEmpty();
+         link = link.tail) {
+      TypeVariable typeNode = link.head;
+      SourceString variableName = typeNode.name.source;
+      TypeVariableType variableType = new TypeVariableType(variableName);
+      TypeVariableElement variableElement =
+          new TypeVariableElement(variableName, classElement, node,
+                                  variableType);
+      variableType.element = variableElement;
+      classElement.typeParameters[variableName] = variableElement;
+      context = new TypeVariablesScope(context, classElement);

[ahe, 2012/03/16 15:29:21]

Move out of loop.

+    }
+    // Resolve the bounds of type variables.
+    for (Link<TypeVariable> link = parameters;
+         !link.isEmpty();
+         link = link.tail) {
+      TypeVariable typeNode = link.head;
+      SourceString variableName = typeNode.name.source;
+      TypeVariableElement variableElement =
+          classElement.typeParameters[variableName];
+      if (typeNode.bound !== null) {
+        Type boundType = visit(typeNode.bound);
+        if (boundType !== null && boundType.element == variableElement) {
+          warning(node, MessageKind.CYCLIC_TYPE_VARIABLE,
+                  [variableElement.name]);
+        } else if (boundType !== null) {
+          variableElement.bound = boundType;
+        } else {
+          variableElement.bound = compiler.objectClass.computeType(compiler);
+        }
+      }
+    }
+    // Find super type.
+    Type supertype = visit(node.superclass);
+    if (supertype !== null && supertype.element.impliesType()) {
+      classElement.supertype = supertype;
+    } else if (supertype !== null) {
+      error(node.superclass, MessageKind.TYPE_NAME_EXPECTED);
+    }
+    if (classElement.name != Types.OBJECT && classElement.supertype === null) {
       ClassElement objectElement = context.lookup(Types.OBJECT);
       if (objectElement !== null && !objectElement.isResolved) {
         compiler.resolver.toResolve.add(objectElement);
       } else if (objectElement === null){
         error(node, MessageKind.CANNOT_RESOLVE_TYPE, [Types.OBJECT]);
       }
-      element.supertype = new SimpleType(Types.OBJECT, objectElement);
+      classElement.supertype = new SimpleType(Types.OBJECT, objectElement);

[ahe, 2012/03/16 15:29:21]

I would like if this was objectElement.type.

     }
     if (node.defaultClause !== null) {
-      element.defaultClass = visit(node.defaultClause.nodes.head);
+      classElement.defaultClass = visit(node.defaultClause);
     }
     for (Link<Node> link = node.interfaces.nodes;
          !link.isEmpty();
          link = link.tail) {
-      element.interfaces = element.interfaces.prepend(visit(link.head));
+      Type interfaceType = visit(link.head);
+      if (interfaceType !== null && interfaceType.element.impliesType()) {

[ngeoffray, 2012/03/18 13:40:57]

A type parameter should imply a type. I think Peter fixed this bug in another
CL, so you should be able to remove the call to impliesType.

+        classElement.interfaces =
+            classElement.interfaces.prepend(interfaceType);
+      } else {
+        error(link.head, MessageKind.TYPE_NAME_EXPECTED);
+      }
     }
-    calculateAllSupertypes(element, new Set<ClassElement>());
-    addDefaultConstructorIfNeeded(element);
-    return element.computeType(compiler);
+    calculateAllSupertypes(classElement, new Set<ClassElement>());
+    addDefaultConstructorIfNeeded(classElement);
+    return classElement.computeType(compiler);
   }
 
   Type visitTypeAnnotation(TypeAnnotation node) {
     return visit(node.typeName);
   }
 
   Type visitIdentifier(Identifier node) {
     Element element = context.lookup(node.source);
     if (element === null) {
       error(node, MessageKind.CANNOT_RESOLVE_TYPE, [node]);
-    } else if (!element.impliesType()) {
+      return null;
+    } else if (!element.impliesType() && !element.isTypeVariable()) {
       error(node, MessageKind.NOT_A_TYPE, [node]);
+      return null;
     } else {
       if (element.isClass()) {
         compiler.resolver.toResolve.add(element);
       }
-      // TODO(ngeoffray): Use type variables.
-      return element.computeType(compiler);
+      if (element.isTypeVariable()) {
+        TypeVariableElement variableElement = element;
+        return variableElement.type;
+      } else if (element.isTypedef()) {
+        compiler.unimplemented('visitIdentifier for typedefs');
+      } else {
+        // TODO(ngeoffray): Use type variables.
+        return element.computeType(compiler);
+      }
     }
     return null;
   }
 
   Type visitSend(Send node) {
     Identifier prefix = node.receiver.asIdentifier();
     if (prefix === null) {
       error(node.receiver, MessageKind.NOT_A_PREFIX, [node.receiver]);
       return null;
     }
@@ skipping 348 matching lines @@
 
 class Scope {
   final Element element;
   final Scope parent;
 
   Scope(this.parent, this.element);
   abstract Element add(Element element);
   abstract Element lookup(SourceString name);
 }
 
+class TypeVariablesScope extends Scope {

[ngeoffray, 2012/03/18 13:40:57]

I'm not sure why you need to create a special scope for type variables. In which
context do you require one? Please add a comment.

+  TypeVariablesScope(parent, ClassElement element) : super(parent, element);

[ngeoffray, 2012/03/18 13:40:57]

Scope parent

+  Element add(Element element) {
+    throw "Cannot add element to TypeVariableScope";
+  }
+  Element lookup(SourceString name) {
+    ClassElement cls = element;
+    Element result = cls.lookupTypeParameter(name);
+    if (result !== null) return result;
+    if (parent !== null) return parent.lookup(name);
+  }
+}
+
 class MethodScope extends Scope {
   final Map<SourceString, Element> elements;
 
   MethodScope(Scope parent, Element element)
     : super(parent, element), this.elements = new Map<SourceString, Element>();
 
   Element lookup(SourceString name) {
     Element element = elements[name];
     if (element !== null) return element;
     return parent.lookup(name);
   }
 
   Element add(Element element) {
     if (elements.containsKey(element.name)) return elements[element.name];
     elements[element.name] = element;
     return element;
   }
 }
 
 class BlockScope extends MethodScope {
   BlockScope(Scope parent) : super(parent, parent.element);
 }
 
 class ClassScope extends Scope {
   ClassScope(ClassElement element, LibraryElement library)
     : super(new TopScope(library), element);
 
   Element lookup(SourceString name) {
     ClassElement cls = element;
-    Element memberElement = cls.lookupLocalMember(name);
-    if (memberElement != null) return memberElement;
-    memberElement = parent.lookup(name);
-    if (memberElement != null) return memberElement;
+    Element result = cls.lookupLocalMember(name);
+    if (result !== null) return result;
+    result = cls.lookupTypeParameter(name);
+    if (result !== null) return result;
+    result = parent.lookup(name);
+    if (result != null) return result;
     return cls.lookupSuperMember(name);
   }
 
   Element add(Element element) {
     throw "Cannot add an element in a class scope";
   }
 }
 
 class TopScope extends Scope {
   LibraryElement get library() => element;
 
   TopScope(LibraryElement library) : super(null, library);
-  Element lookup(SourceString name) => library.find(name);
+  Element lookup(SourceString name) {
+    return library.find(name);

[ngeoffray, 2012/03/18 13:40:57]

Why this change?

+  }
 
   Element add(Element element) {
     throw "Cannot add an element in the top scope";
   }
 }