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

Unified Diff: sdk/lib/_internal/compiler/implementation/resolution/members.dart

Issue 23825007: Reapply r27285: "Support dynamic as type literal." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comment. Created 7 years, 3 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: sdk/lib/_internal/compiler/implementation/resolution/members.dart
diff --git a/sdk/lib/_internal/compiler/implementation/resolution/members.dart b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
index 4aed80b6d27b2b96f673ca869eb65b22d0b04bae..43277864ae5c704cb381fce0b89913867e9435a7 100644
--- a/sdk/lib/_internal/compiler/implementation/resolution/members.dart
+++ b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
@@ -1751,8 +1751,7 @@ class ResolverVisitor extends MappingVisitor<Element> {
ResolutionEnqueuer get world => compiler.enqueuer.resolution;
- Element lookup(Node node, SourceString name) {
- Element result = scope.lookup(name);
+ Element reportLookupErrorIfAny(Element result, Node node, SourceString name) {
if (!Elements.isUnresolved(result)) {
if (!inInstanceContext && result.isInstanceMember()) {
compiler.reportError(
@@ -1828,7 +1827,12 @@ class ResolverVisitor extends MappingVisitor<Element> {
}
return null;
} else {
- Element element = lookup(node, node.source);
+ SourceString name = node.source;
+ Element element = scope.lookup(name);
+ if (Elements.isUnresolved(element) && name.slowToString() == 'dynamic') {
+ element = compiler.dynamicClass;
+ }
+ element = reportLookupErrorIfAny(element, node, node.source);
if (element == null) {
if (!inInstanceContext) {
element = warnAndCreateErroneousElement(
@@ -4128,7 +4132,8 @@ class ConstructorResolver extends CommonResolverVisitor<Element> {
Element visitIdentifier(Identifier node) {
SourceString name = node.source;
- Element e = resolver.lookup(node, name);
+ Element e = resolver.reportLookupErrorIfAny(
+ resolver.scope.lookup(name), node, name);
// TODO(johnniwinther): Change errors to warnings, cf. 11.11.1.
if (e == null) {
return failOrReturnErroneousElement(resolver.enclosingElement, node, name,
« no previous file with comments | « sdk/lib/_internal/compiler/implementation/js_backend/namer.dart ('k') | tests/language/first_class_types_literals_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698