Fix bug 578

frog/world.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.
 
 /** The one true [World]. */
 World world;
 
 /**
  * Should be called exactly once to setup singleton world.
  * Can use world.reset() to reinitialize.
@@ skipping 57 matching lines @@
 
   Map<String, Library> libraries;
   Library corelib;
 
   Library get coreimpl() => libraries['dart:coreimpl'];
   Library get dom() => libraries['dart:dom'];
 
   List<Library> _todo;
 
   /** Internal map to track name conflicts in the generated javascript. */
-  Map<String, Named> _topNames;
+  Map<String, Element> _topNames;
 
   Map<String, MemberSet> _members;
 
   int errors = 0, warnings = 0;
   int dartBytesRead = 0, jsBytesWritten = 0;
   bool seenFatal = false;
 
   // Special types to Dart.
   DefinedType varType;
   // TODO(jimhug): Is this ever not === varType?
@@ skipping 63 matching lines @@
 
     var mset = _members[member.name];
     if (mset == null) {
       mset = new MemberSet(member, isVar:true);
       _members[mset.name] = mset;
     } else {
       mset.members.add(member);
     }
   }
 
-  _addTopName(Named named) {
-    var existing = _topNames[named.name];
+  _addTopName(Element named) {
+    var existing = _topNames[named.jsname];
     if (existing != null) {
-      info('mangling matching top level name "${named.name}" in '
-          + 'both "${named.library.name}" and "${existing.library.name}"');
+      info('mangling matching top level name "${named.jsname}" in '
+          + 'both "${named.library.jsname}" and "${existing.library.jsname}"');
 
       if (named.isNative) {
         // resolve conflicts in favor first of natives
         if (existing.isNative) {
-          world.internalError('conflicting native names "${named.name}" '
+          world.internalError('conflicting native names "${named.jsname}" '
               + '(already defined in ${existing.span.locationText})',
               named.span);
         } else {
-          _topNames[named.name] = named;
+          _topNames[named.jsname] = named;
           _addJavascriptTopName(existing);
         }
       } else if (named.library.isCore) {
         // then in favor of corelib
         if (existing.library.isCore) {
           world.internalError(
-              'conflicting top-level names in core "${named.name}" '
+              'conflicting top-level names in core "${named.jsname}" '
               + '(previously defined in ${existing.span.locationText})',
               named.span);
         } else {
-          _topNames[named.name] = named;
+          _topNames[named.jsname] = named;
           _addJavascriptTopName(existing);
         }
       } else {
         // then just first in wins
         _addJavascriptTopName(named);
       }
     } else {
-      _topNames[named.name] = named;
+      _topNames[named.jsname] = named;
     }
   }
 
-  _addJavascriptTopName(Named named) {
-    named.jsname = '${named.library.jsname}_${named.name}';
+  _addJavascriptTopName(Element named) {
+    named._jsname = '${named.library.jsname}_${named.jsname}';
     final existing = _topNames[named.jsname];
     if (existing != null && existing != named) {
       world.internalError('name mangling failed for "${named.jsname}" '
           + '("${named.jsname}" defined also in ${existing.span.locationText})',
           named.span);
     }
     _topNames[named.jsname] = named;
   }
 
   _addType(Type type) {
@@ skipping 232 matching lines @@
 
   withTiming(String name, f()) {
     final sw = new Stopwatch();
     sw.start();
     var result = f();
     sw.stop();
     info('$name in ${sw.elapsedInMs()}msec');
     return result;
   }
 }