Big merge from experimental to bleeding edge.

sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library mirrors_dart2js;
 
+import 'dart:async';
 import 'dart:io';
 import 'dart:uri';
 
 import '../../compiler.dart' as diagnostics;
 import '../elements/elements.dart';
 import '../resolution/resolution.dart' show ResolverTask, ResolverVisitor;
 import '../apiimpl.dart' as api;
 import '../scanner/scannerlib.dart';
 import '../ssa/ssa.dart';
 import '../dart2jslib.dart';
@@ skipping 1280 matching lines @@
     }
     if (other is! ClassMirror) {
       return false;
     }
     if (other.isOriginalDeclaration) {
       return false;
     }
     if (originalDeclaration != other.originalDeclaration) {
       return false;
     }
-    var thisTypeArguments = typeArguments.iterator();
-    var otherTypeArguments = other.typeArguments.iterator();
-    while (thisTypeArguments.hasNext && otherTypeArguments.hasNext) {
-      if (thisTypeArguments.next() != otherTypeArguments.next()) {
+    var thisTypeArguments = typeArguments.iterator;
+    var otherTypeArguments = other.typeArguments.iterator;
+    while (thisTypeArguments.moveNext()) {
+      if (!otherTypeArguments.moveNext()) return false;
+      if (thisTypeArguments.current != otherTypeArguments.current) {
         return false;
       }
     }
-    return !thisTypeArguments.hasNext && !otherTypeArguments.hasNext;
+    return !otherTypeArguments.moveNext();
   }
 }
 
 
 class Dart2JsFunctionTypeMirror extends Dart2JsTypeElementMirror
     implements FunctionTypeMirror {
   final FunctionSignature _functionSignature;
   List<ParameterMirror> _parameters;
 
   Dart2JsFunctionTypeMirror(Dart2JsMirrorSystem system,
@@ skipping 469 matching lines @@
   }
 
   Future<InstanceMirror> getField(String fieldName) {
     Constant fieldConstant = _fieldMap[fieldName];
     if (fieldConstant != null) {
       return new Future<InstanceMirror>.immediate(
           _convertConstantToInstanceMirror(mirrors, fieldConstant));
     }
     return super.getField(fieldName);
   }
-}
+}