Change more JS foreign methods to JS_GET_NAME.

sdk/lib/_internal/compiler/js_lib/js_rti.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.
 
 /**
  * This part contains helpers for supporting runtime type information.
  *
  * The helper use a mixture of Dart and JavaScript objects. To indicate which is
  * used where we adopt the scheme of using explicit type annotation for Dart
  * objects and 'var' or omitted return type for JavaScript objects.
@@ skipping 88 matching lines @@
 getRuntimeTypeInfo(Object target) {
   if (target == null) return null;
   return JS('var', r'#.$builtinTypeInfo', target);
 }
 
 /**
  * Returns the type arguments of [target] as an instance of [substitutionName].
  */
 getRuntimeTypeArguments(target, substitutionName) {
   var substitution =
-      getField(target, '${JS_OPERATOR_AS_PREFIX()}$substitutionName');
+      getField(target, '${JS_GET_NAME(JsGetName.OPERATOR_AS_PREFIX)}$substitutionName');

[herhut, 2015/06/03 08:58:28]

Long line...

   return substitute(substitution, getRuntimeTypeInfo(target));
 }
 
 /**
  * Returns the [index]th type argument of [target] as an instance of
  * [substitutionName].
  */
 @NoThrows() @NoSideEffects() @NoInline()
 getRuntimeTypeArgument(Object target, String substitutionName, int index) {
   var arguments = getRuntimeTypeArguments(target, substitutionName);
@@ skipping 265 matching lines @@
   if (rti != null) {
     // If the type has type variables (that is, `rti != null`), make a copy of
     // the type arguments and insert [o] in the first position to create a
     // compound type representation.
     rti = JS('JSExtendableArray', '#.slice()', rti);  // Make a copy.
     JS('', '#.splice(0, 0, #)', rti, type);  // Insert type at position 0.
     type = rti;
   } else if (isDartFunctionType(t)) {
     // Functions are treated specially and have their type information stored
     // directly in the instance.
-    var targetSignatureFunction = getField(o, '${JS_SIGNATURE_NAME()}');
+    var targetSignatureFunction = getField(o, '${JS_GET_NAME(JsGetName.SIGNATURE_NAME)}');

[herhut, 2015/06/03 08:58:28]

Long line...

     if (targetSignatureFunction == null) return false;
     type = invokeOn(targetSignatureFunction, o, null);
     return isFunctionSubtype(type, t);
   }
   return isSubtype(type, t);
 }
 
 Object subtypeOfRuntimeTypeCast(Object object, var type) {
   if (object != null && !checkSubtypeOfRuntimeType(object, type)) {
     String actualType = Primitives.objectTypeName(object);
@@ skipping 46 matching lines @@
   var typeOfT = isJsArray(t) ? getIndex(t, 0) : t;
 
   // Check for a subtyping flag.
   // Get the necessary substitution of the type arguments, if there is one.
   var substitution;
   if (isNotIdentical(typeOfT, typeOfS)) {
     if (!builtinIsSubtype(typeOfS, runtimeTypeToString(typeOfT))) {
       return false;
     }
     var typeOfSPrototype = JS('', '#.prototype', typeOfS);
-    var field = '${JS_OPERATOR_AS_PREFIX()}${runtimeTypeToString(typeOfT)}';
+    var field = '${JS_GET_NAME(JsGetName.OPERATOR_AS_PREFIX)}${runtimeTypeToString(typeOfT)}';

[herhut, 2015/06/03 08:58:28]

Long line...

     substitution = getField(typeOfSPrototype, field);
   }
   // The class of [s] is a subclass of the class of [t].  If [s] has no type
   // arguments and no substitution, it is used as raw type.  If [t] has no
   // type arguments, it used as a raw type.  In both cases, [s] is a subtype
   // of [t].
   if ((!isJsArray(s) && substitution == null) || !isJsArray(t)) {
     return true;
   }
   // Recursively check the type arguments.
@@ skipping 51 matching lines @@
     var tType = JS('', '#[#]', t, name);
     var sType = JS('', '#[#]', s, name);
     if (!isAssignable(tType, sType)) return false;
   }
   return true;
 }
 
 bool isFunctionSubtype(var s, var t) {
   assert(isDartFunctionType(t));
   if (!isDartFunctionType(s)) return false;
-  if (hasField(s, '${JS_FUNCTION_TYPE_VOID_RETURN_TAG()}')) {
-    if (hasNoField(t, '${JS_FUNCTION_TYPE_VOID_RETURN_TAG()}') &&
-        hasField(t, '${JS_FUNCTION_TYPE_RETURN_TYPE_TAG()}')) {
+  if (hasField(s, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_VOID_RETURN_TAG)}')) {
+    if (hasNoField(t, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_VOID_RETURN_TAG)}') &&

[herhut, 2015/06/03 08:58:28]

Long line...

+        hasField(t, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_RETURN_TYPE_TAG)}')) {

[herhut, 2015/06/03 08:58:29]

Long line...

       return false;
     }
-  } else if (hasNoField(t, '${JS_FUNCTION_TYPE_VOID_RETURN_TAG()}')) {
-    var sReturnType = getField(s, '${JS_FUNCTION_TYPE_RETURN_TYPE_TAG()}');
-    var tReturnType = getField(t, '${JS_FUNCTION_TYPE_RETURN_TYPE_TAG()}');
+  } else if (hasNoField(t, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_VOID_RETURN_TAG)}')) {

[herhut, 2015/06/03 08:58:28]

Long line...

+    var sReturnType = getField(s, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_RETURN_TYPE_TAG)}');

[herhut, 2015/06/03 08:58:28]

Long line...

+    var tReturnType = getField(t, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_RETURN_TYPE_TAG)}');

[herhut, 2015/06/03 08:58:29]

Long line...

     if (!isAssignable(sReturnType, tReturnType)) return false;
   }
   var sParameterTypes =
-      getField(s, '${JS_FUNCTION_TYPE_REQUIRED_PARAMETERS_TAG()}');
+      getField(s, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_REQUIRED_PARAMETERS_TAG)}');
   var tParameterTypes =
-      getField(t, '${JS_FUNCTION_TYPE_REQUIRED_PARAMETERS_TAG()}');
+      getField(t, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_REQUIRED_PARAMETERS_TAG)}');

[herhut, 2015/06/03 08:58:28]

Long line...

 
   var sOptionalParameterTypes =
-      getField(s, '${JS_FUNCTION_TYPE_OPTIONAL_PARAMETERS_TAG()}');
+      getField(s, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_OPTIONAL_PARAMETERS_TAG)}');

[herhut, 2015/06/03 08:58:28]

Long line...

   var tOptionalParameterTypes =
-      getField(t, '${JS_FUNCTION_TYPE_OPTIONAL_PARAMETERS_TAG()}');
+      getField(t, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_OPTIONAL_PARAMETERS_TAG)}');

[herhut, 2015/06/03 08:58:28]

Long line...

 
   int sParametersLen = sParameterTypes != null ? getLength(sParameterTypes) : 0;
   int tParametersLen = tParameterTypes != null ? getLength(tParameterTypes) : 0;
 
   int sOptionalParametersLen =
       sOptionalParameterTypes != null ? getLength(sOptionalParameterTypes) : 0;
   int tOptionalParametersLen =
       tOptionalParameterTypes != null ? getLength(tOptionalParameterTypes) : 0;
 
   if (sParametersLen > tParametersLen) {
@@ skipping 37 matching lines @@
     // parameters of [s]:
     for (; tPos < tOptionalParametersLen ; sPos++, tPos++) {
       if (!isAssignable(getIndex(sOptionalParameterTypes, sPos),
                         getIndex(tOptionalParameterTypes, tPos))) {
         return false;
       }
     }
   }
 
   var sNamedParameters =
-      getField(s, '${JS_FUNCTION_TYPE_NAMED_PARAMETERS_TAG()}');
+      getField(s, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_NAMED_PARAMETERS_TAG)}');

[herhut, 2015/06/03 08:58:29]

Long line...

   var tNamedParameters =
-      getField(t, '${JS_FUNCTION_TYPE_NAMED_PARAMETERS_TAG()}');
+      getField(t, '${JS_GET_NAME(JsGetName.FUNCTION_TYPE_NAMED_PARAMETERS_TAG)}');

[herhut, 2015/06/03 08:58:28]

Long line...

   return areAssignableMaps(sNamedParameters, tNamedParameters);
 }
 
 /**
  * Calls the JavaScript [function] with the [arguments] with the global scope
  * as the `this` context.
  */
 invoke(var function, var arguments) => invokeOn(function, null, arguments);
 
 /**
@@ skipping 45 matching lines @@
  * `null` and `undefined` (which we can avoid).
  */
 bool isIdentical(var s, var t) => JS('bool', '# === #', s, t);
 
 /**
  * Returns `true` if the JavaScript values [s] and [t] are not identical. We use
  * this helper instead of [identical] because `identical` needs to merge
  * `null` and `undefined` (which we can avoid).
  */
 bool isNotIdentical(var s, var t) => JS('bool', '# !== #', s, t);