Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: pkg/compiler/lib/src/inferrer/type_graph_nodes.dart

Issue 2603263002: Prefix resolution_types with Resolution. (Closed)
Patch Set: Rebased Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/inferrer/type_graph_nodes.dart
diff --git a/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart b/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart
index fe98524488a7c470774e773e93774a83aa135973..7244856d1ae6775da3b3bd58a16be51156824a66 100644
--- a/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart
+++ b/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart
@@ -11,7 +11,7 @@ import '../common/names.dart' show Identifiers;
import '../compiler.dart' show Compiler;
import '../constants/values.dart';
import '../elements/resolution_types.dart'
- show DartType, FunctionType, TypeKind;
+ show ResolutionDartType, ResolutionFunctionType, ResolutionTypeKind;
import '../elements/elements.dart';
import '../js_backend/backend.dart';
import '../tree/dartstring.dart' show DartString;
@@ -483,7 +483,7 @@ class MemberTypeInformation extends ElementTypeInformation
element.isConstructor);
TypedElement typedElement = element;
var elementType = typedElement.type;
- if (elementType.kind != TypeKind.FUNCTION) {
+ if (elementType.kind != ResolutionTypeKind.FUNCTION) {
return safeType(inferrer);
} else {
return inferrer
@@ -528,7 +528,7 @@ class MemberTypeInformation extends ElementTypeInformation
assert(
element.isFunction || element.isGetter || element.isFactoryConstructor);
- FunctionType type = element.type;
+ ResolutionFunctionType type = element.type;
return _narrowType(inferrer.closedWorld, mask, type.returnType);
}
@@ -1726,7 +1726,7 @@ abstract class TypeInformationVisitor<T> {
}
TypeMask _narrowType(
- ClosedWorld closedWorld, TypeMask type, DartType annotation,
+ ClosedWorld closedWorld, TypeMask type, ResolutionDartType annotation,
{bool isNullable: true}) {
if (annotation.treatAsDynamic) return type;
if (annotation.isObject) return type;
« no previous file with comments | « pkg/compiler/lib/src/inferrer/type_graph_inferrer.dart ('k') | pkg/compiler/lib/src/js_backend/backend.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698