Index: sdk/lib/_internal/compiler/js_lib/js_rti.dart |
diff --git a/sdk/lib/_internal/compiler/js_lib/js_rti.dart b/sdk/lib/_internal/compiler/js_lib/js_rti.dart |
index 7b9db7cd00c6a15f4e1a46fa4afa05f84fc5047c..36edf22324ef68d0818f953dd0b72bac96bc54e6 100644 |
--- a/sdk/lib/_internal/compiler/js_lib/js_rti.dart |
+++ b/sdk/lib/_internal/compiler/js_lib/js_rti.dart |
@@ -106,7 +106,7 @@ getRuntimeTypeInfo(Object target) { |
*/ |
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)); |
} |
@@ -392,7 +392,7 @@ bool checkSubtypeOfRuntimeType(o, t) { |
} 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); |
@@ -459,7 +459,7 @@ bool isSubtype(var s, var t) { |
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 |
@@ -531,25 +531,25 @@ bool areAssignableMaps(var s, var t) { |
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; |
@@ -607,9 +607,9 @@ bool isFunctionSubtype(var s, var t) { |
} |
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); |
} |