Revert "Emit named parameter information in declaration order."

sdk/lib/_internal/lib/js_helper.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.
 
 library _js_helper;
 
 import 'dart:collection';
 
 import 'dart:_foreign_helper' show
     DART_CLOSURE_TO_JS,
@@ skipping 348 matching lines @@
   final int optionalParameterCount;
 
   /// Are optional parameters named.
   final bool areOptionalParametersNamed;
 
   /// Either an index to the function type in [:init.metadata:] or a JavaScript
   /// function object which can compute such a type (presumably due to free
   /// type variables).
   final functionType;
 
-  List cachedSortedIndices;
-
   ReflectionInfo.internal(this.jsFunction,
                           this.data,
                           this.isAccessor,
                           this.requiredParameterCount,
                           this.optionalParameterCount,
                           this.areOptionalParametersNamed,
                           this.functionType);
 
   factory ReflectionInfo(jsFunction) {
     List data = JS('JSExtendableArray|Null', r'#.$reflectionInfo', jsFunction);
@@ skipping 26 matching lines @@
     return JS('', '#[2 * # + # + # + 1]', data, parameter,
         optionalParameterCount, FIRST_DEFAULT_ARGUMENT);
   }
 
   int defaultValue(int parameter) {
     if (parameter < requiredParameterCount) return null;
     return JS('int', '#[# + # - #]', data,
               FIRST_DEFAULT_ARGUMENT, parameter, requiredParameterCount);
   }
 
-  /// Returns the default value of the [parameter]th entry of the list of
-  /// parameters sorted by name.
-  int defaultValueInOrder(int parameter) {
-    if (parameter < requiredParameterCount) return null;
-
-    if (!areOptionalParametersNamed || optionalParameterCount == 1) {
-      return defaultValue(parameter);
-    }
-
-    int index = sortedIndex(parameter - requiredParameterCount);
-    return defaultValue(index);
-  }
-
-  /// Returns the default value of the [parameter]th entry of the list of
-  /// parameters sorted by name.
-  String parameterNameInOrder(int parameter) {
-    if (parameter < requiredParameterCount) return null;
-
-    if (!areOptionalParametersNamed ||
-        optionalParameterCount == 1) {
-      return parameterName(parameter);
-    }
-
-    int index = sortedIndex(parameter - requiredParameterCount);
-    return parameterName(index);
-  }
-
-  /// Computes the index of the parameter in the list of named parameters sorted
-  /// by their name.
-  int sortedIndex(int unsortedIndex) {
-    if (cachedSortedIndices == null) {
-      // TODO(karlklose): cache this between [ReflectionInfo] instances or cache
-      // [ReflectionInfo] instances by [jsFunction].
-      cachedSortedIndices = new List(optionalParameterCount);
-      Map<String, int> positions = <String, int>{};
-      for (int i = 0; i < optionalParameterCount; i++) {
-        int index = requiredParameterCount + i;
-        positions[parameterName(index)] = index;
-      }
-      int index = 0;
-      (positions.keys.toList()..sort()).forEach((String name) {
-        cachedSortedIndices[index++] = positions[name] + requiredParameterCount;
-      });
-    }
-    return cachedSortedIndices[unsortedIndex];
-  }
-
   @NoInline()
   computeFunctionRti(jsConstructor) {
     if (JS('bool', 'typeof # == "number"', functionType)) {
       return getMetadata(functionType);
     } else if (JS('bool', 'typeof # == "function"', functionType)) {
       var fakeInstance = JS('', 'new #()', jsConstructor);
       setRuntimeTypeInfo(
           fakeInstance, JS('JSExtendableArray', '#["<>"]', fakeInstance));
       return JS('=Object|Null', r'#.apply({$receiver:#})',
                 functionType, fakeInstance);
@@ skipping 491 matching lines @@
       } else {
         positionalArguments = [];
       }
       // Check the number of positional arguments is valid.
       if (info.requiredParameterCount != positionalArguments.length) {
         return functionNoSuchMethod(
             function, positionalArguments, namedArguments);
       }
       var defaultArguments = new Map();
       for (int i = 0; i < info.optionalParameterCount; i++) {
-        int index = i + info.requiredParameterCount;
-        var parameterName = info.parameterNameInOrder(index);
-        var value = info.defaultValueInOrder(index);
-        var defaultValue = getMetadata(value);
+        var parameterName = info.parameterName(i + info.requiredParameterCount);
+        var defaultValue =
+            getMetadata(info.defaultValue(i + info.requiredParameterCount));
         defaultArguments[parameterName] = defaultValue;
       }
       bool bad = false;
       namedArguments.forEach((String parameter, value) {
         if (defaultArguments.containsKey(parameter)) {
           defaultArguments[parameter] = value;
         } else {
           // Extraneous named argument.
           bad = true;
         }
@@ skipping 2122 matching lines @@
  * Returns a property name for placing data on JavaScript objects shared between
  * DOM isolates.  This happens when multiple programs are loaded in the same
  * JavaScript context (i.e. page).  The name is based on [name] but with an
  * additional part that is unique for each isolate.
  *
  * The form of the name is '___dart_$name_$id'.
  */
 String getIsolateAffinityTag(String name) {
   return JS('String', 'init.getIsolateTag(#)', name);
 }