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

Unified Diff: lib/compiler/implementation/dart_backend/placeholder_collector.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/dart_backend/placeholder_collector.dart
diff --git a/lib/compiler/implementation/dart_backend/placeholder_collector.dart b/lib/compiler/implementation/dart_backend/placeholder_collector.dart
index a07e5ce878a758968a0ca60e37185bd43fe3ec1e..c3fb5d9ee8af4c3600b12f3ad40f1fb38493bfa5 100644
--- a/lib/compiler/implementation/dart_backend/placeholder_collector.dart
+++ b/lib/compiler/implementation/dart_backend/placeholder_collector.dart
@@ -285,7 +285,7 @@ class PlaceholderCollector extends AbstractVisitor {
identifier, () => new Set<Identifier>()).add(node);
}
- void makeTypePlaceholder(Node node, Type type) {
+ void makeTypePlaceholder(Node node, DartType type) {
makeElementPlaceholder(node, type.element);
}
@@ -525,7 +525,7 @@ class PlaceholderCollector extends AbstractVisitor {
if (node.defaultClause !== null) {
// Can't just visit class node's default clause because of the bug in the
// resolver, it just crashes when it meets type variable.
- Type defaultType = classElement.defaultClass;
+ DartType defaultType = classElement.defaultClass;
assert(defaultType !== null);
makeTypePlaceholder(node.defaultClause.typeName, defaultType);
visit(node.defaultClause.typeArguments);
@@ -545,7 +545,7 @@ class PlaceholderCollector extends AbstractVisitor {
}
// Another poor man type resolution.
// Find this variable in enclosing type declaration parameters.
- for (Type type in typeDeclaration.typeVariables) {
+ for (DartType type in typeDeclaration.typeVariables) {
if (type.name.slowToString() == name.source.slowToString()) {
makeTypePlaceholder(name, type);
return true;

Powered by Google App Engine
This is Rietveld 408576698