Start resolving classes and default constructors.

frog/leg/elements/elements.dart

 // Copyright (c) 2011, 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 11 matching lines @@
 class ElementKind {
   final String id;
 
   const ElementKind(String this.id);
 
   static final ElementKind VARIABLE = const ElementKind('variable');
   static final ElementKind PARAMETER = const ElementKind('parameter');
   static final ElementKind FUNCTION = const ElementKind('function');
   static final ElementKind CLASS = const ElementKind('class');
   static final ElementKind FOREIGN = const ElementKind('foreign');
+  static final ElementKind CONSTRUCTOR = const ElementKind('constructor');
 
   toString() => id;
 }
 
 class Element implements Hashable {
   final SourceString name;
   final ElementKind kind;
   final Element enclosingElement;
   abstract Node parseNode(Canceler canceler, Logger logger);
   abstract Type computeType(Compiler compiler, Types types);
+  bool isClassMember() =>
+      enclosingElement !== null && enclosingElement.kind == ElementKind.CLASS;
 
   const Element(this.name, this.kind, this.enclosingElement);
 
   // TODO(kasperl): This is a very bad hash code for the element and
   // there's no reason why two elements with the same name should have
   // the same hash code. Replace this with a simple id in the element?
   int hashCode() => name.hashCode();
 }
 
 class VariableElement extends Element {
@@ skipping 36 matching lines @@
     return types.dynamicType;
   }
   return types.lookup(annotation.typeName.source);
 }
 
 class FunctionElement extends Element {
   Link<Element> parameters;
   FunctionExpression node;
   Type type;
 
-  // TODO(ngeoffray): set the enclosingElement.
-  FunctionElement(SourceString name) : super(name, ElementKind.FUNCTION, null);
-  FunctionElement.node(FunctionExpression node, Element enclosing)
-    : super(node.name.dynamic.source, ElementKind.FUNCTION, enclosing),
+  FunctionElement(SourceString name,
+                  ElementKind kind,
+                  Element enclosing)
+    : super(name, kind, enclosing);
+  FunctionElement.node(FunctionExpression node,
+                       ElementKind kind,
+                       Element enclosing)
+    : super(node.name.asIdentifier().source, kind, enclosing),
       this.node = node;
 
   FunctionType computeType(Compiler compiler, types) {
     if (type != null) return type;
     if (parameters == null) compiler.resolveSignature(this);
 
     FunctionExpression node = parseNode(compiler, compiler);
     Type returnType = getType(node.returnType, types);
     if (returnType === null) compiler.cancel('unknown type ${node.returnType}');
 
     LinkBuilder<Type> parameterTypes = new LinkBuilder<Type>();
     for (Link<Element> link = parameters; !link.isEmpty(); link = link.tail) {
       parameterTypes.addLast(link.head.computeType(compiler, types));
     }
     type = new FunctionType(returnType, parameterTypes.toLink());
     return type;
   }
 
   Node parseNode(Canceler canceler, Logger logger) => node;
 }
 
+class SynthesizedConstructorElement extends FunctionElement {
+  SynthesizedConstructorElement(Element enclosing)
+    : super(const SourceString(''), ElementKind.CONSTRUCTOR, enclosing) {
+    parameters = const EmptyLink<Element>();
+  }
+
+  FunctionType computeType(Compiler compiler, types) {
+    if (type != null) return type;
+    type = new FunctionType(types.voidType, const EmptyLink<Type>());
+    return type;
+  }
+
+  Node parseNode(Canceler canceler, Logger logger) {
+    if (node != null) return node;
+    node = new FunctionExpression(
+        new Identifier(new StringToken(null, '', null)),

[ahe, 2011/12/02 11:27:41]

Please add a constructor like:

new Identifier.synthetic('');

I'd like to keep the Token subclasses contained in the parser and scanner.

[ngeoffray, 2011/12/02 14:44:54]

Done.

+        new NodeList.empty(),
+        new Block(new NodeList.empty()));
+    return node;
+  }
+}
+
 class ClassElement extends Element {
   Type type;
   Type supertype;
   Link<Type> interfaces = const EmptyLink<Type>();
   bool isResolved = false;
 
   ClassElement(SourceString name) : super(name, ElementKind.CLASS, null);
 
   Type computeType(compiler, types) {
     if (type === null) {
       type = new SimpleType(name, this);
     }
     return type;
   }
 
   void resolve(Compiler compiler) {
     if (isResolved) return;
     compiler.resolveType(this);
     isResolved = true;
   }
+
+  // TODO(ngeoffray): Implement these.
+  Element lookupLocalElement(SourceString name) => null;
+  bool canHaveDefaultConstructor() => true;
+  void addConstructor(Element element) {}
 }