Fix bug 578

frog/library.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.
 
 class LibraryImport {
   String prefix;
   Library library;
   LibraryImport(this.library, [this.prefix = null]);
 }
 
+
 /** Represents a Dart library. */
-class Library {
+class Library extends Element {
   final SourceFile baseSource;
   Map<String, DefinedType> types;
   List<LibraryImport> imports;
   String sourceDir;
-  String name;
   List<SourceFile> natives;
   List<SourceFile> sources;
 
   Map<String, MemberSet> _privateMembers;
 
   /** The type that holds top level types in the library. */
   DefinedType topType;
 
   /** Set to true by [WorldGenerator] once this type has been written. */
   bool isWritten = false;
 
   /**
    * Set to true by [WorldGenerator] once this library has been marked as used.
    * Only used with the compileAll flag. */
   bool isMarked = false;
 
-  String _jsname;
-
-  Library(this.baseSource) {
+  Library(this.baseSource) : super(null, null) {
     sourceDir = dirname(baseSource.filename);
     topType = new DefinedType(null, this, null, true);
     types = { '': topType };
     imports = [];
     natives = [];
     sources = [];
     _privateMembers = {};
   }
 
+  Element get enclosingElement() => null;
+  Library get library() => this;
+
+  bool get isNative() => topType.isNative;
+
   bool get isCore() => this == world.corelib;
   bool get isCoreImpl() => this == world.coreimpl;
 
-  String get jsname() {
-    if (_jsname == null) {
-      // TODO(jimhug): Expand to handle all illegal id characters
-      _jsname = name.replaceAll('.', '_').replaceAll(':', '_').replaceAll(
-          ' ', '_');
-    }
-    return _jsname;
-  }
-
   SourceSpan get span() => new SourceSpan(baseSource, 0, 0);
 
   String makeFullPath(String filename) {
     if (filename.startsWith('dart:')) return filename;
     // TODO(jmesserly): replace with node.js path.resolve
     if (filename.startsWith('/')) return filename;
     if (filename.startsWith('file:///')) return filename;
     if (filename.startsWith('http://')) return filename;
     return joinPaths(sourceDir, filename);
   }
@@ skipping 23 matching lines @@
         if (member.declaringType.isTop) {
           world._addTopName(member);
         }
         return;
       }
 
       var mset = _privateMembers[member.name];
       if (mset == null) {
         // TODO(jimhug): Make this lazier!
         for (var lib in world.libraries.getValues()) {
-          if (lib._privateMembers.containsKey(member.name)) {
-            member.jsname = '_$jsname${member.name}';
+          if (lib._privateMembers.containsKey(member.jsname)) {
+            member._jsname = '_$jsname${member.jsname}';
             break;
           }
         }
 
         mset = new MemberSet(member);
         _privateMembers[member.name] = mset;
       } else {
         mset.members.add(member);
       }
     } else {
       world._addMember(member);
     }
   }
 
-  // TODO(jimhug): Cache and share the types as interfaces?
-  Type getOrAddFunctionType(String name, FunctionDefinition func, Type inType) {
+  // TODO(jimhug): Cache and share the types as interfaces!
+  Type getOrAddFunctionType(Element enclosingElement, String name,
+      FunctionDefinition func) {
+    // TODO(jimhug): This is redundant now that FunctionDef has type params.
     final def = new FunctionTypeDefinition(func, null, func.span);
     final type = new DefinedType(name, this, def, false);
     type.addMethod('\$call', func);
-    type.members['\$call'].resolve(inType);
+    var m = type.members['\$call'];
+    m.enclosingElement = enclosingElement;
+    m.resolve();
     // Function types implement the Function interface.
     type.interfaces = [world.functionType];
     return type;
   }
 
   /** Adds a type to the library. */
   DefinedType addType(String name, Node definition, bool isClass) {
     if (types.containsKey(name)) {
       var existingType = types[name];
       if (isCore && existingType.definition == null) {
@@ skipping 51 matching lines @@
         if (ret != null  && ret != newRet) {
           world.error('conflicting types for "$name"', ret.span, newRet.span);
         } else {
           ret = newRet;
         }
       }
     }
     return ret;
   }
 
+  Type resolveType(TypeReference node, bool typeErrors) {
+    if (node == null) return world.varType;
+
+    if (node.type != null) return node.type;
+
+    node.type = findType(node);
+
+    if (node.type == null) {
+      var message = 'cannot find type ${_getDottedName(node)}';
+      if (typeErrors) {
+        world.error(message, node.span);
+        node.type = world.objectType;
+      } else {
+        world.warning(message, node.span);
+        node.type = world.varType;
+      }
+    }
+    return node.type;
+  }
+
+  static String _getDottedName(NameTypeReference type) {
+    if (type.names != null) {
+      var names = map(type.names, (n) => n.name);
+      return type.name.name + '.' + Strings.join(names, '.');
+    } else {
+      return type.name.name;
+    }
+  }
+
   Member lookup(String name, SourceSpan span) {
     var retType = findTypeByName(name);
     var ret = null;
 
     if (retType != null) {
       ret = retType.typeMember;
     }
 
     var newRet = topType.getMember(name);
     // TODO(jimhug): Shares too much code with body of loop.
@@ skipping 30 matching lines @@
       name = baseSource.filename;
       var index = name.lastIndexOf('/', name.length);
       if (index >= 0) {
         name = name.substring(index+1);
       }
       index = name.indexOf('.', 0);
       if (index > 0) {
         name = name.substring(0, index);
       }
     }
+    // TODO(jimhug): Expand to handle all illegal id characters
+    _jsname =
+      name.replaceAll('.', '_').replaceAll(':', '_').replaceAll(' ', '_');
+
     for (var type in types.getValues()) {
       type.resolve();
     }
   }
 
   visitSources() {
     var visitor = new _LibraryVisitor(this);
     visitor.addSource(baseSource);
   }
 
@@ skipping 58 matching lines @@
     }
 
     var name;
     switch (node.name.name) {
       case "library":
         name = getSingleStringArg(node);
         if (library.name == null) {
           library.name = name;
           // TODO(jimhug): Hack to get native fields for io and dom - generalize.
           if (name == 'node' || name == 'dom') {
-            library.topType.isNativeType = true;
+            library.topType.isNative = true;
           }
           if (seenImport || seenSource || seenResource) {
             world.error('#library must be first directive in file', node.span);
           }
         } else {
           world.error('already specified library name', node.span);
         }
         break;
 
       case "import":
@@ skipping 116 matching lines @@
 
   void visitFunctionDefinition(FunctionDefinition node) {
     currentType.addMethod(node.name.name, node);
   }
 
   void visitFunctionTypeDefinition(FunctionTypeDefinition node) {
     var type = library.addType(node.func.name.name, node, false);
     type.addMethod('\$call', node.func);
   }
 }