fix generic const canonicalization bug

frog/frogsh

 #!/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) { 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 2236 matching lines @@
   }
   return this;
 }
 StringBufferImpl.prototype.clear = function() {
   this._buffer = new ListFactory();
   this._length = 0;
   return this;
 }
 StringBufferImpl.prototype.toString = function() {
   if (this._buffer.length == 0) return "";
-  if ($notnull_bool($eq(this._buffer.length, 1))) return $assert_String(this._buffer.$index(0));
+  if (this._buffer.length == 1) return $assert_String(this._buffer.$index(0));
   var result = StringBase.concatAll(this._buffer);
   this._buffer.clear();
   this._buffer.add(result);
   return result;
 }
 StringBufferImpl.prototype.add$1 = StringBufferImpl.prototype.add;
 StringBufferImpl.prototype.addAll$1 = function($0) {
   return this.addAll(($0 && $0.is$Collection$Object()));
 };
 StringBufferImpl.prototype.isEmpty$0 = function() {
   return this.isEmpty();
 };
 StringBufferImpl.prototype.toString$0 = function() {
   return this.toString();
 };
 // ********** Code for StringBase **************
 function StringBase() {}
 StringBase.createFromCharCodes = function(charCodes) {
   if (Object.getPrototypeOf(charCodes) !== Array.prototype) {
     var length = charCodes.length;
     var tmp = new Array(length);
     for (var i = 0; i < length; i++) {
       tmp[i] = charCodes.$index(i);
     }
     charCodes = tmp;
   }
   return String.fromCharCode.apply(null, charCodes);
 }
 StringBase.join = function(strings, separator) {
-  if ($notnull_bool($eq(strings.length, 0))) return '';
+  if (strings.length == 0) return '';
   var s = $assert_String(strings.$index(0));
   for (var i = 1;
-   i < $assert_num(strings.length); i++) {
+   i < strings.length; i++) {
     s = s + separator + strings.$index(i);
   }
   return s;
 }
 StringBase.concatAll = function(strings) {
   return StringBase.join(strings, "");
 }
 // ********** Code for StringImplementation **************
 StringImplementation = String;
 StringImplementation.prototype.is$Pattern = function(){return this;};
@@ skipping 360 matching lines @@
 // ********** Code for AbstractLink$T **************
 function AbstractLink$T() {
   // Initializers done
 }
 $inherits(AbstractLink$T, AbstractLink);
 AbstractLink$T.prototype.is$Link$Element = function(){return this;};
 AbstractLink$T.prototype.is$Link$Node = function(){return this;};
 AbstractLink$T.prototype.is$Link$Token = function(){return this;};
 AbstractLink$T.prototype.is$Link$Type = function(){return this;};
 AbstractLink$T.prototype.is$Iterable = function(){return this;};
+AbstractLink$T.prototype.prepend = function(element) {
+  return new LinkEntry$T(element, this);
+}
 AbstractLink$T.prototype.iterator = function() {
   var $0;
   return (($0 = this.toList().iterator$0()) && $0.is$Iterator$T());
 }
+AbstractLink$T.prototype.printOn = function(buffer, separatedBy) {
+  if ($notnull_bool(this.isEmpty())) return;
+  buffer.add(this.get$head() == null ? 'null' : this.get$head());
+  if (separatedBy == null) separatedBy = '';
+  for (var link = this.get$tail();
+   !$notnull_bool(link.isEmpty()); link = link.get$tail()) {
+    buffer.add(separatedBy);
+    buffer.add(link.get$head() == null ? 'null' : link.get$head());
+  }
+}
+AbstractLink$T.prototype.toString = function() {
+  var buffer = new StringBufferImpl("");
+  buffer.add('[ ');
+  this.printOn(buffer, ', ');
+  buffer.add(' ]');
+  return buffer.toString();
+}
 // ********** Code for LinkTail **************
 function LinkTail() {
   // Initializers done
   AbstractLink$T.call(this);
 }
 $inherits(LinkTail, AbstractLink$T);
 LinkTail.prototype.is$Link$Element = function(){return this;};
 LinkTail.prototype.is$Link$Node = function(){return this;};
 LinkTail.prototype.is$Link$Token = function(){return this;};
 LinkTail.prototype.is$Link$Type = function(){return this;};
@@ skipping 108 matching lines @@
 $inherits(LinkEntry$T, LinkEntry);
 // ********** Code for LinkBuilderImplementation **************
 function LinkBuilderImplementation() {
   this.head = null
   this.lastLink = null
   // Initializers done
 }
 LinkBuilderImplementation.prototype.get$head = function() { return this.head; };
 LinkBuilderImplementation.prototype.set$head = function(value) { return this.head = value; };
 LinkBuilderImplementation.prototype.toLink = function() {
-  if (this.head == null) return const$16/*const EmptyLink<Token>()*/;
-  this.lastLink.realTail = const$16/*const EmptyLink<Token>()*/;
+  if (this.head == null) return const$232/*const LinkTail()*/;
+  this.lastLink.realTail = const$232/*const LinkTail()*/;
   var link = this.head;
   this.lastLink = null;
   this.head = null;
   return link;
 }
 LinkBuilderImplementation.prototype.addLast = function(t) {
   var entry = new LinkEntry$T(t, null);
   if (this.head == null) {
     this.head = entry;
   }
@@ skipping 2810 matching lines @@
 }
 ParserError.prototype.toString = function() {
   return this.reason;
 }
 ParserError.prototype.toString$0 = function() {
   return this.toString();
 };
 // ********** Code for ElementListener **************
 function ElementListener(canceler) {
   this.previousIdentifier = null
-  this.nodes = const$16/*const EmptyLink<Token>()*/
-  this.topLevelElements = const$16/*const EmptyLink<Token>()*/
+  this.nodes = const$202/*const EmptyLink<Node>()*/
+  this.topLevelElements = const$203/*const EmptyLink<Element>()*/
   this.canceler = canceler;
   // Initializers done
   Listener.call(this);
 }
 $inherits(ElementListener, Listener);
 ElementListener.prototype.get$nodes = function() { return this.nodes; };
 ElementListener.prototype.set$nodes = function(value) { return this.nodes = value; };
 ElementListener.prototype.beginLibraryTag = function(token) {
   this.canceler.cancel("Cannot handle library tags", null, token);
 }
@@ skipping 280 matching lines @@
   this.pushNode(new Throw(null, throwToken, endToken));
 }
 NodeListener.prototype.handleUnaryPostfixExpression = function(token) {
   this.pushNode(new Send.postfix$ctor(this.popNode(), new Operator(token)));
 }
 NodeListener.prototype.handleUnaryPrefixExpression = function(token) {
   this.pushNode(new Send.prefix$ctor(this.popNode(), new Operator(token)));
 }
 NodeListener.prototype.makeNodeList = function(count, beginToken, endToken, delimiter) {
   var $0;
-  var nodes = (const$16/*const EmptyLink<Token>()*/ && const$16/*const EmptyLink<Token>()*/.is$Link$Node());
+  var nodes = const$202/*const EmptyLink<Node>()*/;
   for (; count > 0; --count) {
     nodes = (($0 = nodes.prepend(this.popNode())) && $0.is$Link$Node());
   }
   var sourceDelimiter = (($0 = (delimiter == null) ? null : new StringWrapper(delimiter)) && $0.is$SourceString());
   return new NodeList(beginToken, nodes, endToken, sourceDelimiter);
 }
 NodeListener.prototype.log = function(message) {
   this.logger.log(message);
 }
 NodeListener.prototype.endArguments$3 = function($0, $1, $2) {
@@ skipping 541 matching lines @@
 function Send(receiver, selector, argumentsNode) {
   this.receiver = receiver;
   this.selector = selector;
   this.argumentsNode = argumentsNode;
   // Initializers done
   Expression.call(this);
 }
 Send.postfix$ctor = function(receiver, selector) {
   this.receiver = receiver;
   this.selector = selector;
-  this.argumentsNode = const$215/*const Postfix()*/;
+  this.argumentsNode = const$219/*const Postfix()*/;
   // Initializers done
   Expression.call(this);
 }
 Send.postfix$ctor.prototype = Send.prototype;
 Send.prefix$ctor = function(receiver, selector) {
   this.receiver = receiver;
   this.selector = selector;
-  this.argumentsNode = const$214/*const Prefix()*/;
+  this.argumentsNode = const$217/*const Prefix()*/;
   // Initializers done
   Expression.call(this);
 }
 Send.prefix$ctor.prototype = Send.prototype;
 $inherits(Send, Expression);
 Send.prototype.is$Send = function(){return this;};
 Send.prototype.get$arguments = function() {
   return this.argumentsNode.get$nodes();
 }
 Send.prototype.accept = function(visitor) {
@@ skipping 76 matching lines @@
 }
 NodeList.singleton$ctor = function(node) {
   // Initializers done
   NodeList.call(this, null, LinkFactory.Link$factory(node));
 }
 NodeList.singleton$ctor.prototype = NodeList.prototype;
 $inherits(NodeList, Node);
 NodeList.prototype.is$NodeList = function(){return this;};
 NodeList.prototype.get$nodes = function() {
   var $0;
-  return (($0 = this._nodes != null ? this._nodes : const$16/*const EmptyLink<Token>()*/) && $0.is$Link$Node());
+  return (($0 = this._nodes != null ? this._nodes : const$202/*const EmptyLink<Node>()*/) && $0.is$Link$Node());
 }
 NodeList.prototype.accept = function(visitor) {
   return visitor.visitNodeList(this);
 }
 NodeList.prototype.getBeginToken = function() {
   var $0;
   if (this.beginToken != null) return this.beginToken;
   if (this.get$nodes() != null) {
     for (var link = this.get$nodes();
      !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
@@ skipping 647 matching lines @@
 Unparser.prototype.visitVariableDefinitions = function(node) {
   var $0;
   if (node.type != null) {
     this.visit(node.type);
   }
   else {
     this.sb.add('var');
   }
   this.sb.add(' ');
   this.visit(node.definitions);
-  if ($notnull_bool($eq(node.endToken.get$value(), const$212/*const SourceString(';')*/))) {
+  if ($notnull_bool($eq(node.endToken.get$value(), const$215/*const SourceString(';')*/))) {
     this.add((($0 = node.endToken.get$value()) && $0.is$SourceString()));
   }
 }
 Unparser.prototype.add$1 = function($0) {
   return this.add(($0 && $0.is$SourceString()));
 };
 Unparser.prototype.visit$1 = function($0) {
   return this.visit(($0 && $0.is$Node()));
 };
 // ********** Code for AbstractVisitor **************
@@ skipping 164 matching lines @@
   if (this.type != null) return this.type;
   this.type = getType(this.typeAnnotation, types);
   return this.type;
 }
 VariableElement.prototype.computeType$2 = function($0, $1) {
   return this.computeType(($0 && $0.is$Compiler()), ($1 && $1.is$Types()));
 };
 // ********** Code for ForeignElement **************
 function ForeignElement(name) {
   // Initializers done
-  Element.call(this, name, const$208, null);
+  Element.call(this, name, const$211, null);
 }
 $inherits(ForeignElement, Element);
 ForeignElement.prototype.computeType = function(compiler, types) {
   return types.dynamicType;
 }
 ForeignElement.prototype.computeType$2 = function($0, $1) {
   return this.computeType(($0 && $0.is$Compiler()), ($1 && $1.is$Types()));
 };
 // ********** Code for FunctionElement **************
 function FunctionElement(name) {
   // Initializers done
-  Element.call(this, name, const$205, null);
+  Element.call(this, name, const$208, null);
 }
 $inherits(FunctionElement, Element);
 FunctionElement.prototype.is$FunctionElement = function(){return this;};
 FunctionElement.prototype.get$parameters = function() { return this.parameters; };
 FunctionElement.prototype.set$parameters = function(value) { return this.parameters = value; };
 FunctionElement.prototype.get$type = function() { return this.type; };
 FunctionElement.prototype.set$type = function(value) { return this.type = value; };
 FunctionElement.prototype.computeType = function(compiler, types) {
   var $0;
   if (this.type != null) return (($0 = this.type) && $0.is$FunctionType());
   if (this.parameters == null) compiler.resolveSignature(this);
   var node = (($0 = this.parseNode(compiler, compiler)) && $0.is$FunctionExpression());
   var returnType = getType(node.returnType, types);
   if (returnType == null) compiler.cancel(('unknown type ' + returnType));
   var parameterTypes = new LinkBuilderImplementation();
   for (var link = this.parameters;
    !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Element())) {
     parameterTypes.addLast(link.get$head().computeType$2(compiler, types));
   }
   this.type = new FunctionType(returnType, (($0 = parameterTypes.toLink()) && $0.is$Link$Type()));
   return (($0 = this.type) && $0.is$FunctionType());
 }
 FunctionElement.prototype.computeType$2 = FunctionElement.prototype.computeType;
 // ********** Code for ClassElement **************
 function ClassElement(name) {
-  this.interfaces = const$16/*const EmptyLink<Token>()*/
+  this.interfaces = const$205/*const EmptyLink<Type>()*/
   this.isResolved = false
   // Initializers done
-  Element.call(this, name, const$203, null);
+  Element.call(this, name, const$206, null);
 }
 $inherits(ClassElement, Element);
 ClassElement.prototype.is$ClassElement = function(){return this;};
 ClassElement.prototype.get$type = function() { return this.type; };
 ClassElement.prototype.set$type = function(value) { return this.type = value; };
 ClassElement.prototype.get$interfaces = function() { return this.interfaces; };
 ClassElement.prototype.set$interfaces = function(value) { return this.interfaces = value; };
 ClassElement.prototype.computeType = function(compiler, types) {
   if (this.type == null) {
     this.type = new SimpleType(this.name, this);
@@ skipping 267 matching lines @@
 }
 SsaBuilder.prototype.unquote = function(literal) {
   var str = ('' + literal.get$value());
   this.compiler.ensure(str[0] == '@');
   var quotes = 1;
   var quote = str[1];
   while (str[quotes + 1] === quote) quotes++;
   return new StringWrapper(str.substring(quotes + 1, str.length - quotes));
 }
 SsaBuilder.prototype.visitLogicalAndOr = function(node, op) {
-  var isAnd = $assert_bool(($eq(const$275/*const SourceString("&&")*/, op.get$source())));
+  var isAnd = $assert_bool(($eq(const$280/*const SourceString("&&")*/, op.get$source())));
   this.visit(node.receiver);
   var boolifiedLeft = this.popBoolified();
   var condition;
   if ($notnull_bool(isAnd)) {
     condition = boolifiedLeft;
   }
   else {
     condition = new HNot(boolifiedLeft);
     this.add(condition);
   }
   var leftBlock = this.close(new HIf(condition, false));
   var leftDefinitions = HashMapImplementation.HashMapImplementation$from$factory(this.definitions);
   var rightBlock = this.graph.addNewBlock();
   leftBlock.addSuccessor(rightBlock);
   this.open(rightBlock);
   this.visit(node.argumentsNode);
   var boolifiedRight = this.popBoolified();
   rightBlock = this.close(new HGoto());
   var joinBlock = this.graph.addNewBlock();
   leftBlock.addSuccessor(joinBlock);
   rightBlock.addSuccessor(joinBlock);
   this.open(joinBlock);
   this.definitions = this.joinDefinitions(joinBlock, leftDefinitions, this.definitions);
   var result = new HPhi.manyInputs$ctor(null, [boolifiedLeft, boolifiedRight]);
   joinBlock.addPhi(result);
   this.stack.add(result);
 }
 SsaBuilder.prototype.visitLogicalNot = function(node) {
-  $assert(node.argumentsNode === const$214/*const Prefix()*/, "node.argumentsNode === const Prefix()", "builder.dart", 369, 12);
+  $assert(node.argumentsNode === const$217/*const Prefix()*/, "node.argumentsNode === const Prefix()", "builder.dart", 369, 12);
   this.visit(node.receiver);
   var not = new HNot(this.popBoolified());
   this.push(not);
 }
 SsaBuilder.prototype.visitUnary = function(node, op, element) {
   this.compiler.unimplemented("visitUnary");
 }
 SsaBuilder.prototype.visitBinary = function(node, op, element) {
   this.visit(node.receiver);
   this.visit(node.argumentsNode);
   var right = this.pop();
   var left = this.pop();
-  if ($notnull_bool($eq(const$278/*const SourceString("+")*/, op.get$source()))) {
+  if ($notnull_bool($eq(const$283/*const SourceString("+")*/, op.get$source()))) {
     this.push(new HAdd(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$279/*const SourceString("-")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$284/*const SourceString("-")*/, op.get$source()))) {
     this.push(new HSubtract(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$280/*const SourceString("*")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$285/*const SourceString("*")*/, op.get$source()))) {
     this.push(new HMultiply(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$281/*const SourceString("/")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$286/*const SourceString("/")*/, op.get$source()))) {
     this.push(new HDivide(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$282/*const SourceString("~/")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$287/*const SourceString("~/")*/, op.get$source()))) {
     this.push(new HTruncatingDivide(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$283/*const SourceString("%")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$288/*const SourceString("%")*/, op.get$source()))) {
     this.push(new HModulo(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$284/*const SourceString("==")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$289/*const SourceString("==")*/, op.get$source()))) {
     this.push(new HEquals(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$285/*const SourceString("<")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$290/*const SourceString("<")*/, op.get$source()))) {
     this.push(new HLess(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$286/*const SourceString("<=")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$291/*const SourceString("<=")*/, op.get$source()))) {
     this.push(new HLessEqual(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$287/*const SourceString(">")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$292/*const SourceString(">")*/, op.get$source()))) {
     this.push(new HGreater(element, [left, right]));
   }
-  else if ($notnull_bool($eq(const$288/*const SourceString(">=")*/, op.get$source()))) {
+  else if ($notnull_bool($eq(const$293/*const SourceString(">=")*/, op.get$source()))) {
     this.push(new HGreaterEqual(element, [left, right]));
   }
 }
 SsaBuilder.prototype.visitSend = function(node) {
   var $0;
   var element = (($0 = this.elements.$index(node)) && $0.is$Element());
   if ((node.selector instanceof Operator)) {
     var op = (($0 = node.selector) && $0.is$Operator());
-    if ($notnull_bool($eq(const$275/*const SourceString("&&")*/, op.get$source())) || $notnull_bool($eq(const$276/*const SourceString("||")*/, op.get$source()))) {
+    if ($notnull_bool($eq(const$280/*const SourceString("&&")*/, op.get$source())) || $notnull_bool($eq(const$281/*const SourceString("||")*/, op.get$source()))) {
       this.visitLogicalAndOr(node, op);
     }
-    else if ($notnull_bool($eq(const$277/*const SourceString("!")*/, op.get$source()))) {
+    else if ($notnull_bool($eq(const$282/*const SourceString("!")*/, op.get$source()))) {
       this.visitLogicalNot(node);
     }
-    else if (node.argumentsNode === const$214/*const Prefix()*/ || node.argumentsNode === const$215/*const Postfix()*/) {
+    else if (node.argumentsNode === const$217/*const Prefix()*/ || node.argumentsNode === const$219/*const Postfix()*/) {
       this.visitUnary(node, op, element);
     }
     else {
       this.visitBinary(node, op, element);
     }
   }
   else if ($notnull_bool(node.get$isPropertyAccess())) {
     if (node.receiver != null) {
       this.compiler.unimplemented("SsaBuilder.visitSend with receiver");
     }
     this.stack.add(this.definitions.$index(element));
   }
   else {
     var link = node.get$arguments();
-    if (element.kind === const$208/*ElementKind.FOREIGN*/) {
+    if (element.kind === const$211/*ElementKind.FOREIGN*/) {
       link = (($0 = link.get$tail()) && $0.is$Link$Node());
     }
     var arguments = [];
     for (; !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
       this.visit((($0 = link.get$head()) && $0.is$Node()));
       arguments.add$1(this.pop());
     }
-    if (element.kind === const$208/*ElementKind.FOREIGN*/) {
+    if (element.kind === const$211/*ElementKind.FOREIGN*/) {
       var literal = (($0 = node.get$arguments().get$head()) && $0.is$LiteralString());
       this.compiler.ensure((literal instanceof LiteralString));
       this.push(new HInvokeForeign(element, arguments, this.unquote(literal)));
     }
     else {
       var selector = (($0 = node.selector) && $0.is$Identifier());
       this.push(new HInvoke(element, arguments));
     }
   }
 }
@@ skipping 157 matching lines @@
   var id = instruction.id;
   var name = $assert_String(this.names.$index(id));
   if (name != null) return name;
   var prefix = 't';
   if (!this.prefixes.containsKey(prefix)) this.prefixes.$setindex(prefix, 0);
   return this.newName(id, ('' + prefix + ((($0 = this.prefixes).$setindex(prefix, ($1 = $0.$index(prefix)) + 1), $1))));
 }
 SsaCodeGenerator.prototype.local = function(local) {
   var $0, $1;
   var element = local.element;
-  if (element != null && $eq(element.kind, const$224/*ElementKind.PARAMETER*/)) {
+  if (element != null && $eq(element.kind, const$228/*ElementKind.PARAMETER*/)) {
     return $assert_String(this.parameterNames.$index(element));
   }
   var id = local.id;
   var name = $assert_String(this.names.$index(id));
   if (name != null) return name;
   var prefix;
   if (element != null) {
     prefix = element.name.get$stringValue();
   }
   else {
@@ skipping 255 matching lines @@
 SsaCodeGenerator.prototype.visitThrow = function(node) {
   var $0;
   this.buffer.add('throw ');
   this.use((($0 = node.inputs.$index(0)) && $0.is$HInstruction()));
   this.buffer.add(';\n');
 }
 SsaCodeGenerator.prototype.visitTypeGuard = function(node) {
   var $0;
   var name;
   if ($notnull_bool(node.isNumber())) {
-    name = const$305/*const SourceString('guard\$num')*/;
+    name = const$310/*const SourceString('guard\$num')*/;
   }
   else {
     unreachable();
   }
   var element = this.compiler.universe.find(name);
   this.compiler.worklist.add(element);
   this.buffer.add(('' + name + '('));
   this.use((($0 = node.inputs.$index(0)) && $0.is$HInstruction()));
   this.buffer.add(')');
 }
@@ skipping 15 matching lines @@
 }
 SsaCodeGenerator.prototype.visitLocal = function(node) {
   this.buffer.add(('var ' + this.local(node)));
 }
 SsaCodeGenerator.prototype.visit$1 = SsaCodeGenerator.prototype.visit;
 // ********** Code for JsNames **************
 function JsNames() {}
 JsNames.get$reserved = function() {
   if ($globals.JsNames__reserved == null) {
     $globals.JsNames__reserved = new HashSetImplementation();
-    $globals.JsNames__reserved.addAll(const$299/*JsNames.reservedPropertySymbols*/);
-    $globals.JsNames__reserved.addAll(const$301/*JsNames.reservedGlobalSymbols*/);
-    $globals.JsNames__reserved.addAll(const$303/*JsNames.javaScriptKeywords*/);
+    $globals.JsNames__reserved.addAll(const$304/*JsNames.reservedPropertySymbols*/);
+    $globals.JsNames__reserved.addAll(const$306/*JsNames.reservedGlobalSymbols*/);
+    $globals.JsNames__reserved.addAll(const$308/*JsNames.javaScriptKeywords*/);
   }
   return $globals.JsNames__reserved;
 }
 JsNames.getValid = function(name) {
   if (JsNames.get$reserved().contains(name)) {
     name = ('\$' + name);
     $assert(!JsNames.get$reserved().contains(name), "!reserved.contains(name)", "js_names.dart", 171, 14);
   }
   else if (name.contains("$")) {
     name = name.replaceAll("$", "_$");
@@ skipping 2016 matching lines @@
 }
 SsaPhiEliminator.prototype.visitPhi = function(phi, loads) {
   var $this = this; // closure support
   var $0;
   $assert(phi != null, "phi !== null", "phi_eliminator.dart", 59, 12);
   var local;
   if (phi.element != null) {
     local = (($0 = this.namedLocals.putIfAbsent(phi.element, (function () {
       var local0 = new HLocal(phi.element);
       $this.entry.addAtEntry(local0);
-      if (phi.element.kind === const$224/*ElementKind.PARAMETER*/) {
+      if (phi.element.kind === const$228/*ElementKind.PARAMETER*/) {
         $this.entry.detach(local0);
       }
       return local0;
     })
     )) && $0.is$HLocal());
   }
   else {
     local = new HLocal(null);
     this.entry.addAtEntry(local);
   }
@@ skipping 636 matching lines @@
     print("------------------");
     print(HTracer.HTracer$singleton$factory());
     print("------------------");
   }
   this.log('compilation succeeded');
   return true;
 }
 Compiler.prototype.scanCoreLibrary = function() {
   var fileName = join([this.get$legDirectory(), 'lib', 'core.dart']);
   this.scanner.scan(this.readScript(fileName));
-  var element = new ForeignElement(const$207/*const SourceString('JS')*/);
+  var element = new ForeignElement(const$210/*const SourceString('JS')*/);
   this.universe.define(element);
 }
 Compiler.prototype.runCompiler = function() {
   var $0;
   this.scanCoreLibrary();
   this.scanner.scan(this.script);
-  var element = this.universe.find(const$210/*Compiler.MAIN*/);
-  if (element == null) this.cancel(('Could not find ' + const$210/*Compiler.MAIN*/));
+  var element = this.universe.find(const$213/*Compiler.MAIN*/);
+  if (element == null) this.cancel(('Could not find ' + const$213/*Compiler.MAIN*/));
   this.compileMethod(element);
   while (!this.worklist.isEmpty()) {
     this.compileMethod((($0 = this.worklist.removeLast()) && $0.is$Element()));
   }
 }
 Compiler.prototype.compileMethod = function(element) {
   var code = $assert_String(this.universe.generatedCode.$index(element));
   if (code != null) return code;
   var tree = this.parser.parse(element);
   var elements = this.resolver.resolve((tree && tree.is$FunctionExpression()));
@@ skipping 132 matching lines @@
 ResolverVisitor.prototype.cancel = function(node, message) {
   this.compiler.cancel(message);
 }
 ResolverVisitor.prototype.visit = function(node) {
   if (node == null) return null;
   return node.accept(this);
 }
 ResolverVisitor.prototype.visitIdentifier = function(node) {
   var element = this.context.lookup(node.get$source());
   if (element == null) {
-    this.error(node, const$217/*MessageKind.CANNOT_RESOLVE*/, [node]);
+    this.error(node, const$221/*MessageKind.CANNOT_RESOLVE*/, [node]);
   }
   return this.useElement(node, element);
 }
 ResolverVisitor.prototype.visitTypeAnnotation = function(node) {
   var name = node.typeName;
-  if ($notnull_bool($eq(name.get$source(), const$219/*const SourceString('var')*/))) return null;
+  if ($notnull_bool($eq(name.get$source(), const$223/*const SourceString('var')*/))) return null;
   if ($notnull_bool($eq(name.get$source(), const$6/*const SourceString('void')*/))) return null;
   var element = this.context.lookup(name.get$source());
   if (element == null) {
-    this.warning(node, const$220/*MessageKind.CANNOT_RESOLVE_TYPE*/, [name]);
+    this.warning(node, const$224/*MessageKind.CANNOT_RESOLVE_TYPE*/, [name]);
   }
-  else if (element.kind !== const$203/*ElementKind.CLASS*/) {
-    this.warning(node, const$222/*MessageKind.NOT_A_TYPE*/, [name]);
+  else if (element.kind !== const$206/*ElementKind.CLASS*/) {
+    this.warning(node, const$226/*MessageKind.NOT_A_TYPE*/, [name]);
   }
   else {
     var cls = (element && element.is$ClassElement());
     this.compiler.resolver.toResolve.add(element);
   }
   return this.useElement(node, element);
 }
 ResolverVisitor.prototype.defineElement = function(node, element) {
   this.compiler.ensure(element != null);
   this.mapping.$setindex(node, element);
@@ skipping 73 matching lines @@
   this.visit(node.body);
   this.context = this.context.parent;
   return enclosingElement;
 }
 FullResolverVisitor.prototype.visitIf = function(node) {
   this.visit(node.condition);
   this.visit(node.thenPart);
   this.visit(node.elsePart);
 }
 FullResolverVisitor.prototype.potentiallyMapOperatorToMethodName = function(name) {
-  if ($notnull_bool($eq(name, const$228/*const SourceString('+')*/))) return const$229/*const SourceString('add')*/;
-  if ($notnull_bool($eq(name, const$230/*const SourceString('-')*/))) return const$231/*const SourceString('sub')*/;
-  if ($notnull_bool($eq(name, const$232/*const SourceString('*')*/))) return const$233/*const SourceString('mul')*/;
-  if ($notnull_bool($eq(name, const$234/*const SourceString('/')*/))) return const$235/*const SourceString('div')*/;
-  if ($notnull_bool($eq(name, const$236/*const SourceString('~/')*/))) return const$237/*const SourceString('tdiv')*/;
-  if ($notnull_bool($eq(name, const$238/*const SourceString('%')*/))) return const$239/*const SourceString('mod')*/;
-  if ($notnull_bool($eq(name, const$240/*const SourceString('==')*/))) return const$241/*const SourceString('eq')*/;
-  if ($notnull_bool($eq(name, const$242/*const SourceString('<')*/))) return const$243/*const SourceString('lt')*/;
-  if ($notnull_bool($eq(name, const$244/*const SourceString('<=')*/))) return const$245/*const SourceString('le')*/;
-  if ($notnull_bool($eq(name, const$246/*const SourceString('>')*/))) return const$247/*const SourceString('gt')*/;
-  if ($notnull_bool($eq(name, const$248/*const SourceString('>=')*/))) return const$249/*const SourceString('ge')*/;
+  if ($notnull_bool($eq(name, const$233/*const SourceString('+')*/))) return const$234/*const SourceString('add')*/;
+  if ($notnull_bool($eq(name, const$235/*const SourceString('-')*/))) return const$236/*const SourceString('sub')*/;
+  if ($notnull_bool($eq(name, const$237/*const SourceString('*')*/))) return const$238/*const SourceString('mul')*/;
+  if ($notnull_bool($eq(name, const$239/*const SourceString('/')*/))) return const$240/*const SourceString('div')*/;
+  if ($notnull_bool($eq(name, const$241/*const SourceString('~/')*/))) return const$242/*const SourceString('tdiv')*/;
+  if ($notnull_bool($eq(name, const$243/*const SourceString('%')*/))) return const$244/*const SourceString('mod')*/;
+  if ($notnull_bool($eq(name, const$245/*const SourceString('==')*/))) return const$246/*const SourceString('eq')*/;
+  if ($notnull_bool($eq(name, const$247/*const SourceString('<')*/))) return const$248/*const SourceString('lt')*/;
+  if ($notnull_bool($eq(name, const$249/*const SourceString('<=')*/))) return const$250/*const SourceString('le')*/;
+  if ($notnull_bool($eq(name, const$251/*const SourceString('>')*/))) return const$252/*const SourceString('gt')*/;
+  if ($notnull_bool($eq(name, const$253/*const SourceString('>=')*/))) return const$254/*const SourceString('ge')*/;
   return name;
 }
 FullResolverVisitor.prototype.visitSend = function(node) {
   var $0;
   this.visit(node.receiver);
   var identifier = (($0 = node.selector) && $0.is$Identifier());
   if (node.receiver != null && !(identifier instanceof Operator)) {
     this.cancel(node, 'Cannot handle qualified method calls');
   }
   var name = this.potentiallyMapOperatorToMethodName(identifier.get$source());
   var target = this.context.lookup(name);
-  if (target == null && !(($notnull_bool($eq(name, const$250/*const SourceString('&&')*/)) || $notnull_bool($eq(name, const$251/*const SourceString('||')*/)) || $notnull_bool($eq(name, const$252/*const SourceString('!')*/))))) {
-    this.error(node, const$217/*MessageKind.CANNOT_RESOLVE*/, [name]);
+  if (target == null && !(($notnull_bool($eq(name, const$255/*const SourceString('&&')*/)) || $notnull_bool($eq(name, const$256/*const SourceString('||')*/)) || $notnull_bool($eq(name, const$257/*const SourceString('!')*/))))) {
+    this.error(node, const$221/*MessageKind.CANNOT_RESOLVE*/, [name]);
   }
   this.visit(node.argumentsNode);
   return this.useElement(node, target);
 }
 FullResolverVisitor.prototype.visitSendSet = function(node) {
   var $0;
   var receiver = (($0 = this.visit(node.receiver)) && $0.is$Element());
   var selector = (($0 = node.selector) && $0.is$Identifier());
   if (receiver != null) {
     this.compiler.unimplemented('Resolver: property access');
   }
   var target = this.context.lookup(selector.get$source());
   if (target == null) {
-    this.error(node, const$217/*MessageKind.CANNOT_RESOLVE*/, [node]);
+    this.error(node, const$221/*MessageKind.CANNOT_RESOLVE*/, [node]);
   }
   this.visit(node.argumentsNode);
   return this.useElement(node, target);
 }
 FullResolverVisitor.prototype.visitLiteralInt = function(node) {
 
 }
 FullResolverVisitor.prototype.visitLiteralDouble = function(node) {
 
 }
@@ skipping 17 matching lines @@
   this.cancel(node, "Unimplemented");
 }
 FullResolverVisitor.prototype.visitReturn = function(node) {
   this.visit(node.expression);
 }
 FullResolverVisitor.prototype.visitThrow = function(node) {
   this.visit(node.expression);
 }
 FullResolverVisitor.prototype.visitVariableDefinitions = function(node) {
   this.visit(node.type);
-  var visitor = new VariableDefinitionsVisitor(node, this, const$253/*ElementKind.VARIABLE*/);
+  var visitor = new VariableDefinitionsVisitor(node, this, const$258/*ElementKind.VARIABLE*/);
   visitor.visit(node.definitions);
 }
 // ********** Code for ClassResolverVisitor **************
 function ClassResolverVisitor(compiler) {
   this.compiler = compiler;
   this.context = new TopScope(compiler.universe);
   // Initializers done
   AbstractVisitor$Type.call(this);
 }
 $inherits(ClassResolverVisitor, AbstractVisitor$Type);
 ClassResolverVisitor.prototype.visitClassNode = function(node) {
   var $0;
   var element = (($0 = this.context.lookup(node.name.get$source())) && $0.is$ClassElement());
   this.compiler.ensure(element != null);
   this.compiler.ensure(!$notnull_bool(element.isResolved));
   element.supertype = this.visit(node.superclass);
   for (var link = node.interfaces.get$nodes();
    !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
     element.interfaces = (($0 = element.interfaces.prepend(this.visit((($0 = link.get$head()) && $0.is$Node())))) && $0.is$Link$Type());
   }
   return element.computeType(this.compiler, null);
 }
 ClassResolverVisitor.prototype.visitTypeAnnotation = function(node) {
   var $0;
   var name = node.typeName;
   var element = this.context.lookup(name.get$source());
   if (element == null) {
-    this.compiler.cancel(new ResolutionError(const$220/*MessageKind.CANNOT_RESOLVE_TYPE*/, [name]).toString());
+    this.compiler.cancel(new ResolutionError(const$224/*MessageKind.CANNOT_RESOLVE_TYPE*/, [name]).toString());
   }
-  else if (element.kind !== const$203/*ElementKind.CLASS*/) {
-    this.compiler.cancel(new ResolutionError(const$222/*MessageKind.NOT_A_TYPE*/, [name]).toString());
+  else if (element.kind !== const$206/*ElementKind.CLASS*/) {
+    this.compiler.cancel(new ResolutionError(const$226/*MessageKind.NOT_A_TYPE*/, [name]).toString());
   }
   else {
     this.compiler.resolver.toResolve.add(element);
     return (($0 = element.computeType(this.compiler, null)) && $0.is$Type());
   }
   return null;
 }
 ClassResolverVisitor.prototype.visit = function(node) {
   var $0;
   if (node == null) return null;
@@ skipping 32 matching lines @@
   return node.get$source();
 }
 VariableDefinitionsVisitor.prototype.visitNodeList = function(node) {
   var $0;
   for (var link = node.get$nodes();
    !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
     var name = (($0 = this.visit((($0 = link.get$head()) && $0.is$Node()))) && $0.is$SourceString());
     var element = new VariableElement((($0 = link.get$head()) && $0.is$Node()), this.definitions.type, this.kind, name, this.resolver.context.enclosingElement);
     var existing = this.resolver.defineElement((($0 = link.get$head()) && $0.is$Node()), element);
     if ($ne(existing, element)) {
-      this.resolver.error(node, const$226/*MessageKind.DUPLICATE_DEFINITION*/, [link.get$head()]);
+      this.resolver.error(node, const$230/*MessageKind.DUPLICATE_DEFINITION*/, [link.get$head()]);
     }
   }
 }
 VariableDefinitionsVisitor.prototype.visit = function(node) {
   return node.accept(this);
 }
 VariableDefinitionsVisitor.prototype.visit$1 = function($0) {
   return this.visit(($0 && $0.is$Node()));
 };
 // ********** Code for ParametersVisitor **************
 function ParametersVisitor(resolver) {
   this.resolver = resolver;
   this.elements = new LinkBuilderImplementation();
   // Initializers done
   AbstractVisitor$Element.call(this);
 }
 $inherits(ParametersVisitor, AbstractVisitor$Element);
 ParametersVisitor.prototype.visitNodeList = function(node) {
   var $0;
   for (var link = node.get$nodes();
    !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
     this.elements.addLast(this.visit((($0 = link.get$head()) && $0.is$Node())));
   }
 }
 ParametersVisitor.prototype.visitVariableDefinitions = function(node) {
   this.resolver.visit(node.type);
-  var visitor = new VariableDefinitionsVisitor(node, this.resolver, const$224/*ElementKind.PARAMETER*/);
+  var visitor = new VariableDefinitionsVisitor(node, this.resolver, const$228/*ElementKind.PARAMETER*/);
   visitor.visit(node.definitions);
   return this.resolver.mapping.$index(node.definitions.get$nodes().get$head());
 }
 ParametersVisitor.prototype.visit = function(node) {
   return node.accept(this);
 }
 ParametersVisitor.prototype.visit$1 = function($0) {
   return this.visit(($0 && $0.is$Node()));
 };
 // ********** Code for Scope **************
 function Scope(parent) {
   // Initializers done
   Scope.enclosing$ctor.call(this, parent, parent.enclosingElement);
 }
 Scope.top$ctor = function() {
   this.parent = null;
-  this.elements = const$216/*const {}*/;
+  this.elements = const$220/*const {}*/;
   this.enclosingElement = null;
   // Initializers done
 }
 Scope.top$ctor.prototype = Scope.prototype;
 Scope.enclosing$ctor = function(parent, enclosingElement) {
   this.parent = parent;
   this.enclosingElement = enclosingElement;
   this.elements = $map([]);
   // Initializers done
 }
@@ skipping 168 matching lines @@
     message = ('' + message + ': ' + reason);
   }
   $throw(new CancelTypeCheckException(node, message));
 }
 TypeCheckerVisitor.prototype.reportTypeWarning = function(node, kind, arguments) {
   this.compiler.reportWarning(node, new TypeWarning(kind, arguments).toString());
 }
 TypeCheckerVisitor.prototype.nonVoidType = function(node) {
   var type = this.type(node);
   if ($eq(type, this.types.voidType)) {
-    this.reportTypeWarning(node, const$268/*MessageKind.VOID_EXPRESSION*/, const$15/*const []*/);
+    this.reportTypeWarning(node, const$273/*MessageKind.VOID_EXPRESSION*/, const$15/*const []*/);
   }
   return type;
 }
 TypeCheckerVisitor.prototype.typeWithDefault = function(node, defaultValue) {
   return node != null ? this.type(node) : defaultValue;
 }
 TypeCheckerVisitor.prototype.type = function(node) {
   var $0;
   if (node == null) this.fail(null, 'unexpected node: null');
   var result = (($0 = node.accept(this)) && $0.is$Type());
   return result;
 }
 TypeCheckerVisitor.prototype.get$type = function() {
   return TypeCheckerVisitor.prototype.type.bind(this);
 }
 TypeCheckerVisitor.prototype.checkAssignable = function(node, s, t) {
   if (!$notnull_bool(this.types.isAssignable(s, t))) {
-    this.reportTypeWarning(node, const$261/*MessageKind.NOT_ASSIGNABLE*/, [s, t]);
+    this.reportTypeWarning(node, const$266/*MessageKind.NOT_ASSIGNABLE*/, [s, t]);
   }
 }
 TypeCheckerVisitor.prototype.visitBlock = function(node) {
   this.type(node.statements);
   return this.types.voidType;
 }
 TypeCheckerVisitor.prototype.visitClassNode = function(node) {
   this.fail(node);
 }
 TypeCheckerVisitor.prototype.visitExpressionStatement = function(node) {
@@ skipping 20 matching lines @@
   this.type(node.thenPart);
   if ($notnull_bool(node.get$hasElsePart())) this.type(node.elsePart);
   return this.types.voidType;
 }
 TypeCheckerVisitor.prototype.visitSend = function(node) {
   var $0;
   var target = this.elements.$index(node);
   var selector = (($0 = node.selector) && $0.is$Identifier());
   if (target != null) {
     var name = selector.get$source();
-    if ($notnull_bool($eq(name, const$228/*const SourceString('+')*/)) || $notnull_bool($eq(name, const$265/*const SourceString('=')*/)) || $notnull_bool($eq(name, const$230/*const SourceString('-')*/)) || $notnull_bool($eq(name, const$232/*const SourceString('*')*/)) || $notnull_bool($eq(name, const$234/*const SourceString('/')*/)) || $notnull_bool($eq(name, const$242/*const SourceString('<')*/)) || $notnull_bool($eq(name, const$236/*const SourceString('~/')*/))) {
+    if ($notnull_bool($eq(name, const$233/*const SourceString('+')*/)) || $notnull_bool($eq(name, const$270/*const SourceString('=')*/)) || $notnull_bool($eq(name, const$235/*const SourceString('-')*/)) || $notnull_bool($eq(name, const$237/*const SourceString('*')*/)) || $notnull_bool($eq(name, const$239/*const SourceString('/')*/)) || $notnull_bool($eq(name, const$247/*const SourceString('<')*/)) || $notnull_bool($eq(name, const$241/*const SourceString('~/')*/))) {
       return this.types.dynamicType;
     }
     var targetType = target.computeType$2(this.compiler, this.types);
     if ($notnull_bool(node.get$isPropertyAccess())) {
       return (targetType && targetType.is$Type());
     }
     else if ($notnull_bool(node.get$isFunctionObjectInvocation())) {
       this.fail(node);
     }
     else {
@@ skipping 59 matching lines @@
 }
 TypeCheckerVisitor.prototype.visitOperator = function(node) {
   return this.types.dynamicType;
 }
 TypeCheckerVisitor.prototype.visitReturn = function(node) {
   var expression = node.expression;
   var isVoidFunction = (this.expectedReturnType === this.types.voidType);
   if (expression != null) {
     var expressionType = this.type(expression);
     if (isVoidFunction && !$notnull_bool(this.types.isAssignable(expressionType, this.types.voidType))) {
-      this.reportTypeWarning(expression, const$259/*MessageKind.RETURN_VALUE_IN_VOID*/, const$15/*const []*/);
+      this.reportTypeWarning(expression, const$264/*MessageKind.RETURN_VALUE_IN_VOID*/, const$15/*const []*/);
     }
     else {
       this.checkAssignable(expression, expressionType, this.expectedReturnType);
     }
   }
   else if (!$notnull_bool(this.types.isAssignable(this.expectedReturnType, this.types.voidType))) {
-    this.reportTypeWarning(node, const$263/*MessageKind.RETURN_NOTHING*/, [this.expectedReturnType]);
+    this.reportTypeWarning(node, const$268/*MessageKind.RETURN_NOTHING*/, [this.expectedReturnType]);
   }
   return null;
 }
 TypeCheckerVisitor.prototype.visitThrow = function(node) {
   if (node.expression != null) this.type(node.expression);
   return this.types.voidType;
 }
 TypeCheckerVisitor.prototype.visitTypeAnnotation = function(node) {
   if (node.typeName == null) return this.types.dynamicType;
   var name = node.typeName.get$source();
   var type = this.types.lookup(name);
   if (type == null) this.fail(node, ('unsupported type ' + name));
   return type;
 }
 TypeCheckerVisitor.prototype.visitVariableDefinitions = function(node) {
   var $0;
   var type = this.typeWithDefault(node.type, this.types.dynamicType);
   if ($eq(type, this.types.voidType)) {
-    this.reportTypeWarning(node.type, const$266/*MessageKind.VOID_VARIABLE*/, const$15/*const []*/);
+    this.reportTypeWarning(node.type, const$271/*MessageKind.VOID_VARIABLE*/, const$15/*const []*/);
     type = this.types.dynamicType;
   }
   for (var link = node.definitions.get$nodes();
    !$notnull_bool(link.isEmpty()); link = (($0 = link.get$tail()) && $0.is$Link$Node())) {
     var initialization = (($0 = link.get$head()) && $0.is$Node());
     this.compiler.ensure((initialization instanceof Identifier) || (initialization instanceof Send));
     if ((initialization instanceof Send)) {
       var initializer = this.nonVoidType((($0 = link.get$head()) && $0.is$Node()));
       this.checkAssignable(node, type, initializer);
     }
@@ skipping 75 matching lines @@
   // Initializers done
 }
 ResolutionWarning.prototype.toString = function() {
   return this.message.toString();
 }
 ResolutionWarning.prototype.toString$0 = function() {
   return this.toString();
 };
 // ********** Code for top level **************
 function unreachable() {
-  $throw(const$270/*const Exception("Internal Error (Leg): UNREACHABLE")*/);
+  $throw(const$275/*const Exception("Internal Error (Leg): UNREACHABLE")*/);
 }
 //  ********** Library frog_leg **************
 // ********** Code for WorldCompiler **************
 function WorldCompiler(world, script) {
   this.world = world;
   // Initializers done
   Compiler.call(this, script);
 }
 $inherits(WorldCompiler, Compiler);
 WorldCompiler.prototype.log = function(message) {
@@ skipping 325 matching lines @@
   var $0;
   this.hasStatics = true;
   var fullname = ("" + field.declaringType.get$jsname() + "." + field.get$jsname());
   if (!this.globals.containsKey(fullname)) {
     this.globals.$setindex(fullname, GlobalValue.GlobalValue$fromStatic$factory(field, fieldValue, dependencies));
   }
   return (($0 = this.globals.$index(fullname)) && $0.is$GlobalValue());
 }
 WorldGenerator.prototype.globalForConst = function(exp, dependencies) {
   var $0;
-  var code = exp.canonicalCode;
-  if (!this.globals.containsKey(code)) {
-    this.globals.$setindex(code, GlobalValue.GlobalValue$fromConst$factory(this.globals.get$length(), exp, dependencies));
+  var key = exp.type.get$jsname() + ':' + exp.canonicalCode;
+  if (!this.globals.containsKey(key)) {
+    this.globals.$setindex(key, GlobalValue.GlobalValue$fromConst$factory(this.globals.get$length(), exp, dependencies));
   }
-  return (($0 = this.globals.$index(code)) && $0.is$GlobalValue());
+  $assert($eq(this.globals.$index(key).get$type(), exp.type), "globals[key].type == exp.type", "gen.dart", 121, 12);
+  return (($0 = this.globals.$index(key)) && $0.is$GlobalValue());
 }
 WorldGenerator.prototype.writeTypes = function(lib) {
   var $0;
   if ($notnull_bool(lib.isWritten)) return;
   lib.isWritten = true;
   var $list = lib.imports;
   for (var $i = 0;$i < $list.length; $i++) {
     var import_ = $list.$index($i);
     this.writeTypes((($0 = import_.get$library()) && $0.is$Library()));
   }
@@ skipping 519 matching lines @@
   else if ($notnull_bool(this.method.get$isStatic())) {
     defWriter.enterBlock(('' + this.method.declaringType.get$jsname() + '.' + this.method.get$jsname() + ' = function' + _params + ' {'));
   }
   else {
     defWriter.enterBlock(('' + this.method.declaringType.get$jsname() + '.prototype.') + ('' + this.method.get$jsname() + ' = function' + _params + ' {'));
   }
   if ($notnull_bool(this.needsThis)) {
     defWriter.writeln('var \$this = this; // closure support');
   }
   if (this._usedTemps.get$length() > 0 || this._freeTemps.length > 0) {
-    $assert(this._usedTemps.get$length() == 0, "_usedTemps.length == 0", "gen.dart", 800, 14);
+    $assert(this._usedTemps.get$length() == 0, "_usedTemps.length == 0", "gen.dart", 803, 14);
     this._freeTemps.addAll(this._usedTemps);
     this._freeTemps.sort((function (x, y) {
       return x.compareTo$1(y);
     })
     );
     defWriter.writeln(('var ' + Strings.join(this._freeTemps, ", ") + ';'));
   }
   defWriter.writeln(this.writer.get$text());
   if ($notnull_bool($ne(names, null))) {
     defWriter.exitBlock(('}).bind(null, ' + Strings.join((names && names.is$List$String()), ", ") + ')'));
@@ skipping 486 matching lines @@
     var next = tmpi.invoke$4(this, 'next', node.list, Arguments.get$EMPTY());
     this.writer.enterBlock(('for (var ' + tmpi.get$code() + ' = ' + iterator.get$code() + '; ' + hasNext.get$code() + '; ) {'));
     this.writer.writeln(('var ' + item.get$code() + ' = ' + next.get$code() + ';'));
   }
   this.visitStatementsInBlock(node.body);
   this.writer.exitBlock('}');
   this._popBlock();
   return false;
 }
 MethodGenerator.prototype._genToDartException = function(ex, node) {
-  var types = const$418/*const [
+  var types = const$423/*const [
         'NullPointerException', 'ObjectNotClosureException',
         'NoSuchMethodException', 'StackOverflowException']*/;
   var target = new Value($globals.world.varType, 'this', node.span, true);
   for (var $i = types.iterator$0(); $i.hasNext$0(); ) {
     var name = $i.next$0();
     $globals.world.corelib.types.$index(name).markUsed$0();
     $globals.world.corelib.types.$index(name).get$members().$index('toString').invoke$4(this, node, target, Arguments.get$EMPTY());
   }
   this.writer.writeln(('' + ex + ' = \$toDartException(' + ex + ');'));
   $globals.world.gen.corejs.useToDartException = true;
@@ skipping 654 matching lines @@
     var u = (item && item.is$UnaryExpression());
     return u.op.kind == 16/*TokenKind.INCR*/ || u.op.kind == 17/*TokenKind.DECR*/;
   }
   else {
     return false;
   }
 }
 MethodGenerator.prototype.visitLiteralExpression = function(node) {
   var $0;
   var type = node.type.type;
-  $assert($ne(type, null), "type != null", "gen.dart", 2235, 12);
+  $assert($ne(type, null), "type != null", "gen.dart", 2238, 12);
   if (!!(($0 = node.value) && $0.is$List)) {
     var items = [];
     var $list = node.value;
     for (var $i = node.value.iterator$0(); $i.hasNext$0(); ) {
       var item = $i.next$0();
       var val = this.visitValue((item && item.is$lang_Expression()));
       val.invoke$4(this, 'toString', item, Arguments.get$EMPTY());
       var code = val.get$code();
       if ((item instanceof BinaryExpression) || (item instanceof ConditionalExpression) || (item instanceof PostfixExpression) || $notnull_bool(this._isUnaryIncrement((item && item.is$lang_Expression())))) {
         code = ('(' + code + ')');
@@ skipping 7276 matching lines @@
 NonNullableType.prototype.resolveTypeParams$1 = function($0) {
   return this.resolveTypeParams(($0 && $0.is$ConcreteType()));
 };
 // ********** Code for ConcreteType **************
 function ConcreteType(name, genericType, typeArguments, typeArgsInOrder) {
   this.genericType = genericType;
   this.typeArguments = typeArguments;
   this.typeArgsInOrder = typeArgsInOrder;
   this.constructors = $map([]);
   this.members = $map([]);
+  this._resolvedMembers = $map([]);
   this.factories = new FactoryMap();
   // Initializers done
   lang_Type.call(this, name);
 }
 $inherits(ConcreteType, lang_Type);
 ConcreteType.prototype.is$ConcreteType = function(){return this;};
 ConcreteType.prototype.get$genericType = function() { return this.genericType; };
 ConcreteType.prototype.get$typeArgsInOrder = function() { return this.typeArgsInOrder; };
 ConcreteType.prototype.set$typeArgsInOrder = function(value) { return this.typeArgsInOrder = value; };
 ConcreteType.prototype.get$isList = function() {
@@ skipping 110 matching lines @@
   }
   var genericMember = this.genericType.members.$index(memberName);
   if ($notnull_bool($ne(genericMember, null))) {
     member = new ConcreteMember($assert_String(genericMember.get$name()), this, genericMember);
     this.members.$setindex(memberName, member);
     return member;
   }
   return this._getMemberInParents(memberName);
 }
 ConcreteType.prototype.resolveMember = function(memberName) {
-  var mem = this.getMember(memberName);
-  if ($notnull_bool(mem == null)) return null;
-  var ret = new MemberSet((mem && mem.is$Member()), false);
-  if ($notnull_bool(mem.get$isStatic())) return (ret && ret.is$MemberSet());
-  var $list = this.genericType.get$subtypes();
-  for (var $i = this.genericType.get$subtypes().iterator(); $i.hasNext$0(); ) {
-    var t = $i.next$0();
-    var m = t.get$members().$index(memberName);
-    if ($notnull_bool($ne(m, null))) ret.add$1(m);
+  var $0;
+  var ret = (($0 = this._resolvedMembers.$index(memberName)) && $0.is$MemberSet());
+  if (ret != null) return ret;
+  var member = this.getMember(memberName);
+  if (member == null) {
+    return null;
   }
-  return (ret && ret.is$MemberSet());
+  ret = new MemberSet(member, false);
+  this._resolvedMembers.$setindex(memberName, ret);
+  if ($notnull_bool(member.get$isStatic())) {
+    return ret;
+  }
+  else {
+    var $list = this.genericType.get$subtypes();
+    for (var $i = this.genericType.get$subtypes().iterator(); $i.hasNext$0(); ) {
+      var t = $i.next$0();
+      if (!$notnull_bool(this.get$isClass()) && $notnull_bool(t.get$isClass())) {
+        var m = t.getMember$1(memberName);
+        if ($notnull_bool($ne(m, null)) && ret.members.indexOf(m) == -1) {
+          ret.add((m && m.is$Member()));
+        }
+      }
+      else {
+        var m = t.get$members().$index(memberName);
+        if ($notnull_bool($ne(m, null))) ret.add((m && m.is$Member()));
+      }
+    }
+    return ret;
+  }
 }
 ConcreteType.prototype.resolveType = function(node, isRequired) {
   var ret = this.genericType.resolveType(node, isRequired);
   return (ret && ret.is$lang_Type());
 }
 ConcreteType.prototype.addDirectSubtype = function(type) {
   this.genericType.addDirectSubtype(type);
 }
 ConcreteType.prototype.addDirectSubtype$1 = function($0) {
   return this.addDirectSubtype(($0 && $0.is$lang_Type()));
@@ skipping 54 matching lines @@
 DefinedType.prototype.set$constructors = function(value) { return this.constructors = value; };
 DefinedType.prototype.get$members = function() { return this.members; };
 DefinedType.prototype.set$members = function(value) { return this.members = value; };
 DefinedType.prototype.get$factories = function() { return this.factories; };
 DefinedType.prototype.set$factories = function(value) { return this.factories = value; };
 DefinedType.prototype.get$isUsed = function() { return this.isUsed; };
 DefinedType.prototype.set$isUsed = function(value) { return this.isUsed = value; };
 DefinedType.prototype.get$isNativeType = function() { return this.isNativeType; };
 DefinedType.prototype.set$isNativeType = function(value) { return this.isNativeType = value; };
 DefinedType.prototype.setDefinition = function(def) {
-  $assert(this.definition == null, "definition == null", "type.dart", 705, 12);
+  $assert(this.definition == null, "definition == null", "type.dart", 728, 12);
   this.definition = def;
   if ((this.definition instanceof TypeDefinition) && $notnull_bool($ne(this.definition.get$nativeType(), null))) {
     this.isNativeType = true;
   }
   if (this.definition != null && this.definition.get$typeParameters() != null) {
     this._concreteTypes = $map([]);
     this.typeParameters = [];
     var $list = this.definition.get$typeParameters();
     for (var $i = 0;$i < $list.length; $i++) {
       var tp = $list.$index($i);
@@ skipping 92 matching lines @@
     var resolvedInterface = this.resolveType((type && type.is$TypeReference()), true);
     if ($notnull_bool(resolvedInterface.get$isClosed()) && !($notnull_bool(this.library.get$isCore()) || $notnull_bool(this.library.get$isCoreImpl()))) {
       $globals.world.error(('can not implement "' + resolvedInterface.get$name() + '": ') + 'only native implementation allowed', (($0 = type.get$span()) && $0.is$SourceSpan()));
     }
     resolvedInterface.addDirectSubtype$1(this);
     interfaces.add$1(resolvedInterface);
   }
   return (interfaces && interfaces.is$List$Type());
 }
 DefinedType.prototype.addDirectSubtype = function(type) {
-  $assert(this._subtypes == null, "_subtypes == null", "type.dart", 826, 12);
+  $assert(this._subtypes == null, "_subtypes == null", "type.dart", 849, 12);
   this.directSubtypes.add(type);
 }
 DefinedType.prototype.get$subtypes = function() {
   var $0;
   if (this._subtypes == null) {
     this._subtypes = new HashSetImplementation();
     var $list = this.directSubtypes;
     for (var $i = this.directSubtypes.iterator(); $i.hasNext$0(); ) {
       var st = $i.next$0();
       this._subtypes.add(st);
@@ skipping 359 matching lines @@
   }
   else {
     $globals.world.internalError('unknown type reference', node.span);
   }
   return node.type;
 }
 DefinedType.prototype.resolveTypeParams = function(inType) {
   return this;
 }
 DefinedType.prototype.getOrMakeConcreteType = function(typeArgs) {
-  $assert(this.get$isGeneric(), "isGeneric", "type.dart", 1258, 12);
+  $assert(this.get$isGeneric(), "isGeneric", "type.dart", 1281, 12);
   var names = [this.name];
   var typeMap = $map([]);
   for (var i = 0;
    i < typeArgs.length; i++) {
     var paramName = this.typeParameters.$index(i).get$name();
     typeMap.$setindex(paramName, typeArgs.$index(i));
     names.add$1(typeArgs.$index(i).get$name());
   }
   var concreteName = Strings.join((names && names.is$List$String()), '\$');
   var ret = this._concreteTypes.$index(concreteName);
   if ($notnull_bool(ret == null)) {
     ret = new ConcreteType($assert_String(concreteName), this, typeMap, typeArgs);
     this._concreteTypes.$setindex(concreteName, ret);
   }
   return (ret && ret.is$lang_Type());
 }
 DefinedType.prototype.getCallStub = function(args) {
-  $assert(this.get$isFunction(), "isFunction", "type.dart", 1278, 12);
+  $assert(this.get$isFunction(), "isFunction", "type.dart", 1301, 12);
   var name = _getCallStubName('call', args);
   if (this.varStubs == null) this.varStubs = $map([]);
   var stub = this.varStubs.$index(name);
   if ($notnull_bool(stub == null)) {
     stub = new VarFunctionStub($assert_String(name), args);
     this.varStubs.$setindex(name, stub);
   }
   return (stub && stub.is$VarFunctionStub());
 }
 DefinedType.prototype.addDirectSubtype$1 = function($0) {
@@ skipping 1529 matching lines @@
 var const$103 = new Keyword("operator", true)/*const Keyword("operator", true)*/;
 var const$105 = new Keyword("set", true)/*const Keyword("set", true)*/;
 var const$107 = new Keyword("source", true)/*const Keyword("source", true)*/;
 var const$109 = new Keyword("static", true)/*const Keyword("static", true)*/;
 var const$111 = new Keyword("typedef", true)/*const Keyword("typedef", true)*/;
 var const$115 = new StringWrapper('EOF')/*const SourceString('EOF')*/;
 var const$12 = new StringWrapper('String')/*const SourceString('String')*/;
 var const$14 = new IllegalAccessException()/*const IllegalAccessException()*/;
 var const$15 = ImmutableList.ImmutableList$from$factory([])/*const []*/;
 var const$16 = new LinkTail()/*const EmptyLink<Token>()*/;
-var const$203 = new ElementKind('class')/*const ElementKind('class')*/;
-var const$205 = new ElementKind('function')/*const ElementKind('function')*/;
-var const$207 = new StringWrapper('JS')/*const SourceString('JS')*/;
-var const$208 = new ElementKind('foreign')/*const ElementKind('foreign')*/;
-var const$210 = new StringWrapper('main')/*const SourceString('main')*/;
-var const$212 = new StringWrapper(';')/*const SourceString(';')*/;
-var const$213 = new NodeList()/*const Prefix()*/;
-var const$214 = new Prefix()/*const Prefix()*/;
-var const$215 = new Postfix()/*const Postfix()*/;
-var const$216 = new ImmutableMap([])/*const {}*/;
-var const$217 = new MessageKind('cannot resolve #{1}')/*const MessageKind(
+var const$202 = new LinkTail()/*const EmptyLink<Node>()*/;
+var const$203 = new LinkTail()/*const EmptyLink<Element>()*/;
+var const$205 = new LinkTail()/*const EmptyLink<Type>()*/;
+var const$206 = new ElementKind('class')/*const ElementKind('class')*/;
+var const$208 = new ElementKind('function')/*const ElementKind('function')*/;
+var const$210 = new StringWrapper('JS')/*const SourceString('JS')*/;
+var const$211 = new ElementKind('foreign')/*const ElementKind('foreign')*/;
+var const$213 = new StringWrapper('main')/*const SourceString('main')*/;
+var const$215 = new StringWrapper(';')/*const SourceString(';')*/;
+var const$216 = new NodeList()/*const Prefix()*/;
+var const$217 = new Prefix()/*const Prefix()*/;
+var const$218 = new NodeList()/*const Postfix()*/;
+var const$219 = new Postfix()/*const Postfix()*/;
+var const$220 = new ImmutableMap([])/*const {}*/;
+var const$221 = new MessageKind('cannot resolve #{1}')/*const MessageKind(
       'cannot resolve #{1}')*/;
-var const$219 = new StringWrapper('var')/*const SourceString('var')*/;
-var const$220 = new MessageKind('cannot resolve type #{1}')/*const MessageKind(
+var const$223 = new StringWrapper('var')/*const SourceString('var')*/;
+var const$224 = new MessageKind('cannot resolve type #{1}')/*const MessageKind(
       'cannot resolve type #{1}')*/;
-var const$222 = new MessageKind('#{1} is not a type')/*const MessageKind(
+var const$226 = new MessageKind('#{1} is not a type')/*const MessageKind(
       '#{1} is not a type')*/;
-var const$224 = new ElementKind('parameter')/*const ElementKind('parameter')*/;
-var const$226 = new MessageKind('duplicate definition of #{1}')/*const MessageKind(
+var const$228 = new ElementKind('parameter')/*const ElementKind('parameter')*/;
+var const$230 = new MessageKind('duplicate definition of #{1}')/*const MessageKind(
       'duplicate definition of #{1}')*/;
-var const$228 = new StringWrapper('+')/*const SourceString('+')*/;
-var const$229 = new StringWrapper('add')/*const SourceString('add')*/;
-var const$230 = new StringWrapper('-')/*const SourceString('-')*/;
-var const$231 = new StringWrapper('sub')/*const SourceString('sub')*/;
-var const$232 = new StringWrapper('*')/*const SourceString('*')*/;
-var const$233 = new StringWrapper('mul')/*const SourceString('mul')*/;
-var const$234 = new StringWrapper('/')/*const SourceString('/')*/;
-var const$235 = new StringWrapper('div')/*const SourceString('div')*/;
-var const$236 = new StringWrapper('~/')/*const SourceString('~/')*/;
-var const$237 = new StringWrapper('tdiv')/*const SourceString('tdiv')*/;
-var const$238 = new StringWrapper('%')/*const SourceString('%')*/;
-var const$239 = new StringWrapper('mod')/*const SourceString('mod')*/;
-var const$240 = new StringWrapper('==')/*const SourceString('==')*/;
-var const$241 = new StringWrapper('eq')/*const SourceString('eq')*/;
-var const$242 = new StringWrapper('<')/*const SourceString('<')*/;
-var const$243 = new StringWrapper('lt')/*const SourceString('lt')*/;
-var const$244 = new StringWrapper('<=')/*const SourceString('<=')*/;
-var const$245 = new StringWrapper('le')/*const SourceString('le')*/;
-var const$246 = new StringWrapper('>')/*const SourceString('>')*/;
-var const$247 = new StringWrapper('gt')/*const SourceString('gt')*/;
-var const$248 = new StringWrapper('>=')/*const SourceString('>=')*/;
-var const$249 = new StringWrapper('ge')/*const SourceString('ge')*/;
+var const$232 = new LinkTail()/*const LinkTail()*/;
+var const$233 = new StringWrapper('+')/*const SourceString('+')*/;
+var const$234 = new StringWrapper('add')/*const SourceString('add')*/;
+var const$235 = new StringWrapper('-')/*const SourceString('-')*/;
+var const$236 = new StringWrapper('sub')/*const SourceString('sub')*/;
+var const$237 = new StringWrapper('*')/*const SourceString('*')*/;
+var const$238 = new StringWrapper('mul')/*const SourceString('mul')*/;
+var const$239 = new StringWrapper('/')/*const SourceString('/')*/;
+var const$240 = new StringWrapper('div')/*const SourceString('div')*/;
+var const$241 = new StringWrapper('~/')/*const SourceString('~/')*/;
+var const$242 = new StringWrapper('tdiv')/*const SourceString('tdiv')*/;
+var const$243 = new StringWrapper('%')/*const SourceString('%')*/;
+var const$244 = new StringWrapper('mod')/*const SourceString('mod')*/;
+var const$245 = new StringWrapper('==')/*const SourceString('==')*/;
+var const$246 = new StringWrapper('eq')/*const SourceString('eq')*/;
+var const$247 = new StringWrapper('<')/*const SourceString('<')*/;
+var const$248 = new StringWrapper('lt')/*const SourceString('lt')*/;
+var const$249 = new StringWrapper('<=')/*const SourceString('<=')*/;
 var const$25 = new Keyword("break", false)/*const Keyword("break")*/;
-var const$250 = new StringWrapper('&&')/*const SourceString('&&')*/;
-var const$251 = new StringWrapper('||')/*const SourceString('||')*/;
-var const$252 = new StringWrapper('!')/*const SourceString('!')*/;
-var const$253 = new ElementKind('variable')/*const ElementKind('variable')*/;
-var const$259 = new MessageKind('cannot return value from void function')/*const MessageKind(
+var const$250 = new StringWrapper('le')/*const SourceString('le')*/;
+var const$251 = new StringWrapper('>')/*const SourceString('>')*/;
+var const$252 = new StringWrapper('gt')/*const SourceString('gt')*/;
+var const$253 = new StringWrapper('>=')/*const SourceString('>=')*/;
+var const$254 = new StringWrapper('ge')/*const SourceString('ge')*/;
+var const$255 = new StringWrapper('&&')/*const SourceString('&&')*/;
+var const$256 = new StringWrapper('||')/*const SourceString('||')*/;
+var const$257 = new StringWrapper('!')/*const SourceString('!')*/;
+var const$258 = new ElementKind('variable')/*const ElementKind('variable')*/;
+var const$264 = new MessageKind('cannot return value from void function')/*const MessageKind(
       'cannot return value from void function')*/;
-var const$261 = new MessageKind('#{1} is not assignable to #{2}')/*const MessageKind(
+var const$266 = new MessageKind('#{1} is not assignable to #{2}')/*const MessageKind(
       '#{1} is not assignable to #{2}')*/;
-var const$263 = new MessageKind('value of type #{1} expected')/*const MessageKind(
+var const$268 = new MessageKind('value of type #{1} expected')/*const MessageKind(
       'value of type #{1} expected')*/;
-var const$265 = new StringWrapper('=')/*const SourceString('=')*/;
-var const$266 = new MessageKind('variable cannot be of type void')/*const MessageKind(
+var const$27 = new Keyword("case", false)/*const Keyword("case")*/;
+var const$270 = new StringWrapper('=')/*const SourceString('=')*/;
+var const$271 = new MessageKind('variable cannot be of type void')/*const MessageKind(
       'variable cannot be of type void')*/;
-var const$268 = new MessageKind('expression does not yield a value')/*const MessageKind(
+var const$273 = new MessageKind('expression does not yield a value')/*const MessageKind(
       'expression does not yield a value')*/;
-var const$27 = new Keyword("case", false)/*const Keyword("case")*/;
-var const$270 = new ExceptionImplementation("Internal Error (Leg): UNREACHABLE")/*const Exception("Internal Error (Leg): UNREACHABLE")*/;
-var const$275 = new StringWrapper("&&")/*const SourceString("&&")*/;
-var const$276 = new StringWrapper("||")/*const SourceString("||")*/;
-var const$277 = new StringWrapper("!")/*const SourceString("!")*/;
-var const$278 = new StringWrapper("+")/*const SourceString("+")*/;
-var const$279 = new StringWrapper("-")/*const SourceString("-")*/;
-var const$280 = new StringWrapper("*")/*const SourceString("*")*/;
-var const$281 = new StringWrapper("/")/*const SourceString("/")*/;
-var const$282 = new StringWrapper("~/")/*const SourceString("~/")*/;
-var const$283 = new StringWrapper("%")/*const SourceString("%")*/;
-var const$284 = new StringWrapper("==")/*const SourceString("==")*/;
-var const$285 = new StringWrapper("<")/*const SourceString("<")*/;
-var const$286 = new StringWrapper("<=")/*const SourceString("<=")*/;
-var const$287 = new StringWrapper(">")/*const SourceString(">")*/;
-var const$288 = new StringWrapper(">=")/*const SourceString(">=")*/;
+var const$275 = new ExceptionImplementation("Internal Error (Leg): UNREACHABLE")/*const Exception("Internal Error (Leg): UNREACHABLE")*/;
+var const$280 = new StringWrapper("&&")/*const SourceString("&&")*/;
+var const$281 = new StringWrapper("||")/*const SourceString("||")*/;
+var const$282 = new StringWrapper("!")/*const SourceString("!")*/;
+var const$283 = new StringWrapper("+")/*const SourceString("+")*/;
+var const$284 = new StringWrapper("-")/*const SourceString("-")*/;
+var const$285 = new StringWrapper("*")/*const SourceString("*")*/;
+var const$286 = new StringWrapper("/")/*const SourceString("/")*/;
+var const$287 = new StringWrapper("~/")/*const SourceString("~/")*/;
+var const$288 = new StringWrapper("%")/*const SourceString("%")*/;
+var const$289 = new StringWrapper("==")/*const SourceString("==")*/;
 var const$29 = new Keyword("catch", false)/*const Keyword("catch")*/;
-var const$299 = ImmutableList.ImmutableList$from$factory(["__PROTO__", "prototype"])/*const <String>["__PROTO__", "prototype"]*/;
-var const$301 = ImmutableList.ImmutableList$from$factory(["NaN", "Infinity", "undefined", "eval", "parseInt", "parseFloat", "isNan", "isFinite", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "Object", "Function", "Array", "String", "Boolean", "Number", "Date", "RegExp", "Error", "EvalError", "RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError", "Math", "arguments", "escape", "unescape", "applicationCache", "closed", "Components", "content", "controllers", "crypto", "defaultStatus", "dialogArguments", "directories", "document", "frameElement", "frames", "fullScreen", "globalStorage", "history", "innerHeight", "innerWidth", "length", "location", "locationbar", "localStorage", "menubar", "mozInnerScreenX", "mozInnerScreenY", "mozScreenPixelsPerCssPixel", "name", "navigator", "opener", "outerHeight", "outerWidth", "pageXOffset", "pageYOffset", "parent", "personalbar", "pkcs11", "returnValue", "screen", "scrollbars", "scrollMaxX", "scrollMaxY", "self", "sessionStorage", "sidebar", "status", "statusbar", "toolbar", "top", "window", "alert", "addEventListener", "atob", "back", "blur", "btoa", "captureEvents", "clearInterval", "clearTimeout", "close", "confirm", "disableExternalCapture", "dispatchEvent", "dump", "enableExternalCapture", "escape", "find", "focus", "forward", "GeckoActiveXObject", "getAttention", "getAttentionWithCycleCount", "getComputedStyle", "getSelection", "home", "maximize", "minimize", "moveBy", "moveTo", "open", "openDialog", "postMessage", "print", "prompt", "QueryInterface", "releaseEvents", "removeEventListener", "resizeBy", "resizeTo", "restore", "routeEvent", "scroll", "scrollBy", "scrollByLines", "scrollByPages", "scrollTo", "setInterval", "setResizeable", "setTimeout", "showModalDialog", "sizeToContent", "stop", "uuescape", "updateCommands", "XPCNativeWrapper", "XPCSafeJSOjbectWrapper", "onabort", "onbeforeunload", "onchange", "onclick", "onclose", "oncontextmenu", "ondragdrop", "onerror", "onfocus", "onhashchange", "onkeydown", "onkeypress", "onkeyup", "onload", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onmozorientation", "onpaint", "onreset", "onresize", "onscroll", "onselect", "onsubmit", "onunload", "ontouchcancel", "ontouchend", "ontouchmove", "ontouchstart", "ongesturestart", "ongesturechange", "ongestureend", "uneval", "getPrototypeOf", "let", "yield", "abstract", "int", "short", "boolean", "interface", "static", "byte", "long", "char", "final", "native", "synchronized", "float", "package", "throws", "goto", "private", "transient", "implements", "protected", "volatile", "double", "public", "attachEvent", "clientInformation", "clipboardData", "createPopup", "dialogHeight", "dialogLeft", "dialogTop", "dialogWidth", "onafterprint", "onbeforedeactivate", "onbeforeprint", "oncontrolselect", "ondeactivate", "onhelp", "onresizeend", "event", "external", "Debug", "Enumerator", "Global", "Image", "ActiveXObject", "VBArray", "Components", "toString", "getClass", "constructor", "prototype", "valueOf", "Anchor", "Applet", "Attr", "Canvas", "CanvasGradient", "CanvasPattern", "CanvasRenderingContext2D", "CDATASection", "CharacterData", "Comment", "CSS2Properties", "CSSRule", "CSSStyleSheet", "Document", "DocumentFragment", "DocumentType", "DOMException", "DOMImplementation", "DOMParser", "Element", "Event", "ExternalInterface", "FlashPlayer", "Form", "Frame", "History", "HTMLCollection", "HTMLDocument", "HTMLElement", "IFrame", "Image", "Input", "JSObject", "KeyEvent", "Link", "Location", "MimeType", "MouseEvent", "Navigator", "Node", "NodeList", "Option", "Plugin", "ProcessingInstruction", "Range", "RangeException", "Screen", "Select", "Table", "TableCell", "TableRow", "TableSelection", "Text", "TextArea", "UIEvent", "Window", "XMLHttpRequest", "XMLSerializer", "XPathException", "XPathResult", "XSLTProcessor", "java", "Packages", "netscape", "sun", "JavaObject", "JavaClass", "JavaArray", "JavaMember", "\$wnd", "\$doc", "\$entry", "\$moduleName", "\$moduleBase", "\$gwt_version", "\$sessionId", "\$stack", "\$stackDepth", "\$location", "call"])/*const <String>[
+var const$290 = new StringWrapper("<")/*const SourceString("<")*/;
+var const$291 = new StringWrapper("<=")/*const SourceString("<=")*/;
+var const$292 = new StringWrapper(">")/*const SourceString(">")*/;
+var const$293 = new StringWrapper(">=")/*const SourceString(">=")*/;
+var const$304 = ImmutableList.ImmutableList$from$factory(["__PROTO__", "prototype"])/*const <String>["__PROTO__", "prototype"]*/;
+var const$306 = ImmutableList.ImmutableList$from$factory(["NaN", "Infinity", "undefined", "eval", "parseInt", "parseFloat", "isNan", "isFinite", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "Object", "Function", "Array", "String", "Boolean", "Number", "Date", "RegExp", "Error", "EvalError", "RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError", "Math", "arguments", "escape", "unescape", "applicationCache", "closed", "Components", "content", "controllers", "crypto", "defaultStatus", "dialogArguments", "directories", "document", "frameElement", "frames", "fullScreen", "globalStorage", "history", "innerHeight", "innerWidth", "length", "location", "locationbar", "localStorage", "menubar", "mozInnerScreenX", "mozInnerScreenY", "mozScreenPixelsPerCssPixel", "name", "navigator", "opener", "outerHeight", "outerWidth", "pageXOffset", "pageYOffset", "parent", "personalbar", "pkcs11", "returnValue", "screen", "scrollbars", "scrollMaxX", "scrollMaxY", "self", "sessionStorage", "sidebar", "status", "statusbar", "toolbar", "top", "window", "alert", "addEventListener", "atob", "back", "blur", "btoa", "captureEvents", "clearInterval", "clearTimeout", "close", "confirm", "disableExternalCapture", "dispatchEvent", "dump", "enableExternalCapture", "escape", "find", "focus", "forward", "GeckoActiveXObject", "getAttention", "getAttentionWithCycleCount", "getComputedStyle", "getSelection", "home", "maximize", "minimize", "moveBy", "moveTo", "open", "openDialog", "postMessage", "print", "prompt", "QueryInterface", "releaseEvents", "removeEventListener", "resizeBy", "resizeTo", "restore", "routeEvent", "scroll", "scrollBy", "scrollByLines", "scrollByPages", "scrollTo", "setInterval", "setResizeable", "setTimeout", "showModalDialog", "sizeToContent", "stop", "uuescape", "updateCommands", "XPCNativeWrapper", "XPCSafeJSOjbectWrapper", "onabort", "onbeforeunload", "onchange", "onclick", "onclose", "oncontextmenu", "ondragdrop", "onerror", "onfocus", "onhashchange", "onkeydown", "onkeypress", "onkeyup", "onload", "onmousedown", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onmozorientation", "onpaint", "onreset", "onresize", "onscroll", "onselect", "onsubmit", "onunload", "ontouchcancel", "ontouchend", "ontouchmove", "ontouchstart", "ongesturestart", "ongesturechange", "ongestureend", "uneval", "getPrototypeOf", "let", "yield", "abstract", "int", "short", "boolean", "interface", "static", "byte", "long", "char", "final", "native", "synchronized", "float", "package", "throws", "goto", "private", "transient", "implements", "protected", "volatile", "double", "public", "attachEvent", "clientInformation", "clipboardData", "createPopup", "dialogHeight", "dialogLeft", "dialogTop", "dialogWidth", "onafterprint", "onbeforedeactivate", "onbeforeprint", "oncontrolselect", "ondeactivate", "onhelp", "onresizeend", "event", "external", "Debug", "Enumerator", "Global", "Image", "ActiveXObject", "VBArray", "Components", "toString", "getClass", "constructor", "prototype", "valueOf", "Anchor", "Applet", "Attr", "Canvas", "CanvasGradient", "CanvasPattern", "CanvasRenderingContext2D", "CDATASection", "CharacterData", "Comment", "CSS2Properties", "CSSRule", "CSSStyleSheet", "Document", "DocumentFragment", "DocumentType", "DOMException", "DOMImplementation", "DOMParser", "Element", "Event", "ExternalInterface", "FlashPlayer", "Form", "Frame", "History", "HTMLCollection", "HTMLDocument", "HTMLElement", "IFrame", "Image", "Input", "JSObject", "KeyEvent", "Link", "Location", "MimeType", "MouseEvent", "Navigator", "Node", "NodeList", "Option", "Plugin", "ProcessingInstruction", "Range", "RangeException", "Screen", "Select", "Table", "TableCell", "TableRow", "TableSelection", "Text", "TextArea", "UIEvent", "Window", "XMLHttpRequest", "XMLSerializer", "XPathException", "XPathResult", "XSLTProcessor", "java", "Packages", "netscape", "sun", "JavaObject", "JavaClass", "JavaArray", "JavaMember", "\$wnd", "\$doc", "\$entry", "\$moduleName", "\$moduleBase", "\$gwt_version", "\$sessionId", "\$stack", "\$stackDepth", "\$location", "call"])/*const <String>[
     // Section references are from Ecma-262
     // (http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf)
 
     // 15.1.1 Value Properties of the Global Object
     "NaN", "Infinity", "undefined",
 
     // 15.1.2 Function Properties of the Global Object
     "eval", "parseInt", "parseFloat", "isNan", "isFinite",
 
     // 15.1.3 URI Handling Function Properties
@@ skipping 110 matching lines @@
     // GWT-defined identifiers
     "\$wnd", "\$doc", "\$entry", "\$moduleName", "\$moduleBase",
     "\$gwt_version", "\$sessionId",
 
     // Identifiers used by JsStackEmulator; later set to obfuscatable
     "\$stack", "\$stackDepth", "\$location",
 
     // TODO: prove why this is necessary or remove it
     "call"
   ]*/;
-var const$303 = ImmutableList.ImmutableList$from$factory(["break", "delete", "function", "return", "typeof", "case", "do", "if", "switch", "var", "catch", "else", "in", "this", "void", "continue", "false", "instanceof", "throw", "while", "debugger", "finally", "new", "true", "with", "default", "for", "null", "try", "abstract", "double", "goto", "native", "static", "boolean", "enum", "implements", "package", "super", "byte", "export", "import", "private", "synchronized", "char", "extends", "int", "protected", "throws", "class", "final", "interface", "public", "transient", "const", "float", "long", "short", "volatile"])/*const <String>[
+var const$308 = ImmutableList.ImmutableList$from$factory(["break", "delete", "function", "return", "typeof", "case", "do", "if", "switch", "var", "catch", "else", "in", "this", "void", "continue", "false", "instanceof", "throw", "while", "debugger", "finally", "new", "true", "with", "default", "for", "null", "try", "abstract", "double", "goto", "native", "static", "boolean", "enum", "implements", "package", "super", "byte", "export", "import", "private", "synchronized", "char", "extends", "int", "protected", "throws", "class", "final", "interface", "public", "transient", "const", "float", "long", "short", "volatile"])/*const <String>[
     // These are current keywords
     "break", "delete", "function", "return", "typeof", "case", "do", "if",
     "switch", "var", "catch", "else", "in", "this", "void", "continue",
     "false", "instanceof", "throw", "while", "debugger", "finally", "new",
     "true", "with", "default", "for", "null", "try",
 
     // These are future keywords
     "abstract", "double", "goto", "native", "static", "boolean", "enum",
     "implements", "package", "super", "byte", "export", "import", "private",
     "synchronized", "char", "extends", "int", "protected", "throws",
     "class", "final", "interface", "public", "transient", "const", "float",
     "long", "short", "volatile"
   ]*/;
-var const$305 = new StringWrapper('guard\$num')/*const SourceString('guard\$num')*/;
 var const$31 = new Keyword("const", false)/*const Keyword("const")*/;
+var const$310 = new StringWrapper('guard\$num')/*const SourceString('guard\$num')*/;
 var const$33 = new Keyword("continue", false)/*const Keyword("continue")*/;
 var const$35 = new Keyword("default", false)/*const Keyword("default")*/;
 var const$37 = new Keyword("do", false)/*const Keyword("do")*/;
 var const$39 = new Keyword("else", false)/*const Keyword("else")*/;
 var const$4 = new StringWrapper('global scope')/*const SourceString('global scope')*/;
 var const$41 = new Keyword("false", false)/*const Keyword("false")*/;
-var const$418 = ImmutableList.ImmutableList$from$factory(['NullPointerException', 'ObjectNotClosureException', 'NoSuchMethodException', 'StackOverflowException'])/*const [
+var const$423 = ImmutableList.ImmutableList$from$factory(['NullPointerException', 'ObjectNotClosureException', 'NoSuchMethodException', 'StackOverflowException'])/*const [
       'NullPointerException', 'ObjectNotClosureException',
       'NoSuchMethodException', 'StackOverflowException']*/;
 var const$43 = new Keyword("final", false)/*const Keyword("final")*/;
 var const$45 = new Keyword("finally", false)/*const Keyword("finally")*/;
 var const$47 = new Keyword("for", false)/*const Keyword("for")*/;
 var const$49 = new Keyword("if", false)/*const Keyword("if")*/;
 var const$5 = new EmptyQueueException()/*const EmptyQueueException()*/;
 var const$51 = new Keyword("in", false)/*const Keyword("in")*/;
 var const$53 = new Keyword("is", false)/*const Keyword("is")*/;
 var const$55 = new Keyword("new", false)/*const Keyword("new")*/;
@@ skipping 62 matching lines @@
       NATIVE,
       NEGATE,
       OPERATOR,
       SET,
       SOURCE,
       STATIC,
       TYPEDEF ]*/;
 var $globals = {};
 $static_init();
 main();