frog isolate fixes: minor changes to the isolate library + architecture.py

frog/minfrog

 #!/usr/bin/env node
 //  ********** Library dart:core **************
 //  ********** Natives dart:core **************
 /**
  * Generates a dynamic call stub for a function.
  * Our goal is to create a stub method like this on-the-fly:
  *   function($0, $1, capture) { return this($0, $1, true, capture); }
  *
  * This stub then replaces the dynamic one on Function, with one that is
  * specialized for that particular function, taking into account its default
@@ skipping 1795 matching lines @@
   }
   return true;
 }
 Collections.filter = function(source, destination, f) {
   for (var $$i = source.iterator(); $$i.hasNext$0(); ) {
     var e = $$i.next$0();
     if (f(e)) destination.add(e);
   }
   return destination;
 }
+// ********** Code for _Worker **************
 // ********** Code for top level **************
 //  ********** Library node **************
 // ********** Code for Process **************
 function Process(_process) {
   this.SIGHUP = 'SIGHUP'
   this.SIGINT = 'SIGINT'
   this.SIGQUIT = 'SIGQUIT'
   this.SIGILL = 'SIGILL'
   this.SIGTRAP = 'SIGTRAP'
   this.SIGABRT = 'SIGABRT'
@@ skipping 10979 matching lines @@
   else if (existing != null) {
     this.info(('mangling matching top level name "' + named.get$jsname() + '" in ') + ('both "' + named.get$library().get$jsname() + '" and "' + existing.get$library().get$jsname() + '"'));
     var existingPri = existing.get$jsnamePriority();
     var namedPri = named.get$jsnamePriority();
     if (existingPri > namedPri || namedPri == 0) {
       this._renameJavascriptTopName(named);
     }
     else if (namedPri > existingPri) {
       this._renameJavascriptTopName(existing);
     }
-    else {
+    else if ((!this._isDomWorker(named) || !this._isIsolateWorker(existing)) && (!this._isDomWorker(existing) || !this._isIsolateWorker(named))) {
       $globals.world.internalError(('conflicting JS name "' + name + '" of same ') + ('priority ' + existingPri + ': (already defined in) ') + ('' + existing.get$span().get$locationText() + ' with priority ' + namedPri + ')'), named.get$span(), existing.get$span());
     }
   }
   else {
     this._topNames.$setindex(name, named);
   }
 }
+World.prototype._isDomWorker = function(e) {
+  return $eq(e.get$library(), this.get$dom()) && e.get$nativeName() == 'Worker';
+}
+World.prototype._isIsolateWorker = function(e) {
+  return $eq(e.get$library(), this.get$coreimpl()) && e.get$nativeName() == 'Worker';
+}
 World.prototype._renameJavascriptTopName = function(named) {
   named._jsname = ('' + named.get$library().get$jsname() + '_' + named.get$jsname());
   var existing = this._topNames.$index(named.get$jsname());
   if (existing != null && $ne(existing, named)) {
     $globals.world.internalError(('name mangling failed for "' + named.get$jsname() + '" ') + ('("' + named.get$jsname() + '" defined also in ' + existing.get$span().get$locationText() + ')'), named.get$span());
   }
   this._topNames.$setindex(named.get$jsname(), named);
 }
 World.prototype._addType = function(type) {
   if (!type.get$isTop()) this._addTopName(type);
@@ skipping 772 matching lines @@
   $globals._RED_COLOR = '\u001b[31m';
 }
 var const$1 = new EmptyQueueException()/*const EmptyQueueException()*/;
 var const$126 = new IllegalAccessException()/*const IllegalAccessException()*/;
 var const$127 = ImmutableList.ImmutableList$from$factory([])/*const []*/;
 var const$2 = new _DeletedKeySentinel()/*const _DeletedKeySentinel()*/;
 var const$7 = new NoMoreElementsException()/*const NoMoreElementsException()*/;
 var $globals = {};
 $static_init();
 main();