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

Side by Side Diff: lib/compiler/implementation/js_backend/selector_map.dart

Issue 10919003: Fix issue with the partial type tree and implemented interfaces. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fix comment. Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 class SelectorMap<T> extends PartialTypeTree { 5 class SelectorMap<T> extends PartialTypeTree {
6 6
7 SelectorMap(Compiler compiler) : super(compiler); 7 SelectorMap(Compiler compiler) : super(compiler);
8 8
9 SelectorMapNode<T> newNode(ClassElement type) 9 SelectorMapNode<T> newSpecializedNode(ClassElement type)
10 => new SelectorMapNode<T>(type); 10 => new SelectorMapNode<T>(type);
11 11
12 T operator [](Selector selector) { 12 T operator [](Selector selector) {
13 SelectorMapNode<T> node = findNode(selectorType(selector), false); 13 SelectorMapNode<T> node = findNode(selectorType(selector), false);
14 if (node === null) return null; 14 if (node === null) return null;
15 Link<SelectorValue<T>> selectors = node.selectorsByName[selector.name]; 15 Link<SelectorValue<T>> selectors = node.selectorsByName[selector.name];
16 if (selectors === null) return null; 16 if (selectors === null) return null;
17 for (Link link = selectors; !link.isEmpty(); link = link.tail) { 17 for (Link link = selectors; !link.isEmpty(); link = link.tail) {
18 SelectorValue<T> existing = link.head; 18 SelectorValue<T> existing = link.head;
19 if (existing.selector.equalsUntyped(selector)) return existing.value; 19 if (existing.selector.equalsUntyped(selector)) return existing.value;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 } 62 }
63 63
64 /** 64 /**
65 * Visits all mappings for selectors that may be used to invoke the 65 * Visits all mappings for selectors that may be used to invoke the
66 * given [member] element. If the [visit] function ever returns false, 66 * given [member] element. If the [visit] function ever returns false,
67 * we abort the traversal early. 67 * we abort the traversal early.
68 */ 68 */
69 void visitMatching(Element member, bool visit(Selector selector, T value)) { 69 void visitMatching(Element member, bool visit(Selector selector, T value)) {
70 assert(member.isMember()); 70 assert(member.isMember());
71 if (root === null) return; 71 if (root === null) return;
72 // TODO(kasperl): For now, we use a different implementation for
73 // visiting if the tree contains interface subtypes.
74 if (containsInterfaceSubtypes) {
75 visitAllMatching(member, visit);
76 } else {
77 visitHierarchyMatching(member, visit);
78 }
79 }
80
81 void visitAllMatching(Element member, bool visit(selector, value)) {
82 root.visitRecursively((SelectorMapNode<T> node) {
83 Link<SelectorValue<T>> selectors = node.selectorsByName[member.name];
84 if (selectors === null) return true;
85 for (Link link = selectors; !link.isEmpty(); link = link.tail) {
86 SelectorValue<T> existing = link.head;
87 Selector selector = existing.selector;
88 // Since we're running through the entire tree we have to use
89 // the applies method that takes types into account.
90 if (selector.applies(member, compiler)) {
91 if (!visit(selector, existing.value)) return false;
92 }
93 }
94 return true;
95 });
96 }
97
98 void visitHierarchyMatching(Element member, bool visit(selector, value)) {
72 visitHierarchy(member.getEnclosingClass(), (SelectorMapNode<T> node) { 99 visitHierarchy(member.getEnclosingClass(), (SelectorMapNode<T> node) {
73 Link<SelectorValue<T>> selectors = node.selectorsByName[member.name]; 100 Link<SelectorValue<T>> selectors = node.selectorsByName[member.name];
74 if (selectors === null) return true; 101 if (selectors === null) return true;
75 for (Link link = selectors; !link.isEmpty(); link = link.tail) { 102 for (Link link = selectors; !link.isEmpty(); link = link.tail) {
76 SelectorValue<T> existing = link.head; 103 SelectorValue<T> existing = link.head;
77 Selector selector = existing.selector; 104 Selector selector = existing.selector;
78 if (selector.appliesUntyped(member, compiler)) { 105 if (selector.appliesUntyped(member, compiler)) {
79 if (!visit(selector, existing.value)) return false; 106 if (!visit(selector, existing.value)) return false;
80 } 107 }
81 } 108 }
(...skipping 11 matching lines...) Expand all
93 selectorsByName = new Map<SourceString, Link<SelectorValue<T>>>(); 120 selectorsByName = new Map<SourceString, Link<SelectorValue<T>>>();
94 121
95 } 122 }
96 123
97 class SelectorValue<T> { 124 class SelectorValue<T> {
98 final Selector selector; 125 final Selector selector;
99 T value; 126 T value;
100 SelectorValue(this.selector, this.value); 127 SelectorValue(this.selector, this.value);
101 toString() => "$selector -> $value"; 128 toString() => "$selector -> $value";
102 } 129 }
OLDNEW
« no previous file with comments | « lib/compiler/implementation/js_backend/partial_type_tree.dart ('k') | tests/compiler/dart2js_extra/dart2js_extra.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698