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

Unified Diff: dart/frog/leg/resolver.dart

Issue 9724032: Resolve type Dynamic and implement black listing. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Address review comments Created 8 years, 9 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
« no previous file with comments | « dart/frog/leg/lib/js_helper.dart ('k') | dart/frog/leg/ssa/closure.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/frog/leg/resolver.dart
diff --git a/dart/frog/leg/resolver.dart b/dart/frog/leg/resolver.dart
index 3b3e8a64243d28a4ddc0401f62023f8723c55175..4e3b4f7bd252eb87df93effe1f3d0e7443c2fc85 100644
--- a/dart/frog/leg/resolver.dart
+++ b/dart/frog/leg/resolver.dart
@@ -1263,6 +1263,9 @@ class ClassResolverVisitor extends CommonResolverVisitor<Type> {
Type supertype = visit(node.superclass);
if (supertype !== null && supertype.element.isExtendable()) {
classElement.supertype = supertype;
+ if (isBlackListed(supertype)) {
+ error(node.superclass, MessageKind.CANNOT_EXTEND, [supertype]);
+ }
} else if (supertype !== null) {
error(node.superclass, MessageKind.TYPE_NAME_EXPECTED);
}
@@ -1285,6 +1288,9 @@ class ClassResolverVisitor extends CommonResolverVisitor<Type> {
if (interfaceType !== null && interfaceType.element.isExtendable()) {
classElement.interfaces =
classElement.interfaces.prepend(interfaceType);
+ if (isBlackListed(interfaceType)) {
+ error(link.head, MessageKind.CANNOT_IMPLEMENT, [interfaceType]);
+ }
} else {
error(link.head, MessageKind.TYPE_NAME_EXPECTED);
}
@@ -1414,6 +1420,22 @@ class ClassResolverVisitor extends CommonResolverVisitor<Type> {
new Block(new NodeList.empty()),
null, null, null, null);
}
+
+ isBlackListed(Type type) {
+ LibraryElement lib = classElement.getLibrary();
+ return
+ lib !== compiler.coreLibrary &&
+ lib !== compiler.coreImplLibrary &&
+ lib !== compiler.jsHelperLibrary &&
+ (type.element === compiler.dynamicClass ||
+ type.element === compiler.boolClass ||
+ type.element === compiler.numClass ||
+ type.element === compiler.intClass ||
+ type.element === compiler.doubleClass ||
+ type.element === compiler.stringClass ||
+ type.element === compiler.nullClass ||
+ type.element === compiler.functionClass);
+ }
}
class VariableDefinitionsVisitor extends CommonResolverVisitor<SourceString> {
« no previous file with comments | « dart/frog/leg/lib/js_helper.dart ('k') | dart/frog/leg/ssa/closure.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698