dart2js OldEmitter: inline FinishClasses.

pkg/compiler/lib/src/js_emitter/old_emitter/nsm_emitter.dart

 // Copyright (c) 2013, 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.
 
 part of dart2js.js_emitter;
 
 class NsmEmitter extends CodeEmitterHelper {
   final List<Selector> trivialNsmHandlers = <Selector>[];
 
   /// If this is true then we can generate the noSuchMethod handlers at startup
@@ skipping 260 matching lines @@
     // Object class to catch noSuchMethod invocations.
     ClassElement objectClass = compiler.objectClass;
     jsAst.Expression createInvocationMirror = backend.emitter
         .staticFunctionAccess(backend.getCreateInvocationMirror());
     String noSuchMethodName = namer.publicInstanceMethodNameByArity(
         Compiler.NO_SUCH_METHOD, Compiler.NO_SUCH_METHOD_ARG_COUNT);
     var type = 0;
     if (useDiffEncoding) {
       statements.add(js.statement('''{
           var objectClassObject =
-                  collectedClasses[#],    // # is name of class Object.
+                  processedClasses.collected[#],    // # is name of class Object.

[floitsch, 2014/12/29 18:00:22]

long line.
The indentation was to align it with the next line. So should be easy to fix.

[zarah, 2014/12/30 14:02:44]

Done.

               shortNames = #.split(","),  // # is diffEncoding.
               nameNumber = 0,
               diffEncodedString = shortNames[0],
               calculatedShortNames = [0, 1];    // 0, 1 are args for splice.
           // If we are loading a deferred library the object class will not be in

[floitsch, 2014/12/29 18:00:22]

long line.

[zarah, 2014/12/30 14:02:43]

Done.

           // the collectedClasses so objectClassObject is undefined, and we skip
           // setting up the names.
 
           if (objectClassObject) {
             if (objectClassObject instanceof Array)
               objectClassObject = objectClassObject[1];
             for (var i = 0; i < diffEncodedString.length; i++) {
               var codes = [],
                   diff = 0,
                   digit = diffEncodedString.charCodeAt(i);
@@ skipping 20 matching lines @@
             shortNames.splice.apply(shortNames, calculatedShortNames);
           }
         }''', [
             js.string(namer.getNameOfClass(objectClass)),
             js.string('$diffEncoding')]));
     } else {
       // No useDiffEncoding version.
       Iterable<String> longs = trivialNsmHandlers.map((selector) =>
              selector.invocationMirrorMemberName);
       statements.add(js.statement(
-          'var objectClassObject = collectedClasses[#],'
+          'var objectClassObject = processedClasses.collected[#],'
           '    shortNames = #.split(",")', [
               js.string(namer.getNameOfClass(objectClass)),
               js.string('$diffEncoding')]));
       if (!minify) {
         statements.add(js.statement('var longNames = #.split(",")',
                 js.string(longs.join(','))));
       }
       statements.add(js.statement(
           'if (objectClassObject instanceof Array)'
           '  objectClassObject = objectClassObject[1];'));
@@ skipping 42 matching lines @@
           noSuchMethodName,
           createInvocationMirror,
           sliceOffsetParams,  // argument to slice
           minify ? 'shortNames' : 'longNames',
           sliceOffsetArguments
       ]));
 
     return statements;
   }
 }