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

Unified Diff: lib/compiler/implementation/js_backend/emitter.dart

Issue 10911007: Rename Type to DartType to avoid conflicts with the class Type in the core library. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 4 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: lib/compiler/implementation/js_backend/emitter.dart
diff --git a/lib/compiler/implementation/js_backend/emitter.dart b/lib/compiler/implementation/js_backend/emitter.dart
index eaf1f1a78bff1c7232a3aa4d7ef91bccaa950fdb..7e1f30a810a22e7d39ebe0df372619031da95e37 100644
--- a/lib/compiler/implementation/js_backend/emitter.dart
+++ b/lib/compiler/implementation/js_backend/emitter.dart
@@ -583,7 +583,7 @@ function(collectedClasses) {
void generateInterfacesIsTests(ClassElement cls,
void generateTypeTest(ClassElement element),
Set<Element> alreadyGenerated) {
- for (Type interfaceType in cls.interfaces) {
+ for (DartType interfaceType in cls.interfaces) {
Element element = interfaceType.element;
if (!alreadyGenerated.contains(element) &&
compiler.codegenWorld.isChecks.contains(element)) {
@@ -894,7 +894,7 @@ $classesCollector.$mangledName = {'':
// receiver type.
Map<ClassElement, Set<ClassElement>> noSuchMethodHolders =
new Map<ClassElement, Set<ClassElement>>();
- Set<ClassElement> noSuchMethodHoldersFor(Type type) {
+ Set<ClassElement> noSuchMethodHoldersFor(DartType type) {
ClassElement element = type.element;
Set<ClassElement> result = noSuchMethodHolders[element];
if (result === null) {
@@ -924,7 +924,7 @@ $classesCollector.$mangledName = {'':
void addNoSuchMethodHandlers(SourceString ignore, Set<Selector> selectors) {
// Cache the object class and type.
ClassElement objectClass = compiler.objectClass;
- Type objectType = objectClass.computeType(compiler);
+ DartType objectType = objectClass.computeType(compiler);
for (Selector selector in selectors) {
// Introduce a helper function that determines if the given
@@ -952,7 +952,7 @@ $classesCollector.$mangledName = {'':
// If the selector is typed, we check to see if that type may
// have a user-defined noSuchMethod implementation. If not, we
// skip the selector altogether.
- Type receiverType = objectType;
+ DartType receiverType = objectType;
ClassElement receiverClass = objectClass;
if (selector is TypedSelector) {
TypedSelector typedSelector = selector;

Powered by Google App Engine
This is Rietveld 408576698