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

Side by Side Diff: dart/lib/compiler/implementation/scanner/class_element_parser.dart

Issue 10823311: Clean up state handling in ClassElement. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Rebased 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « dart/lib/compiler/implementation/elements/elements.dart ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2011, 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 ClassElementParser extends PartialParser { 5 class ClassElementParser extends PartialParser {
6 ClassElementParser(Listener listener) : super(listener); 6 ClassElementParser(Listener listener) : super(listener);
7 7
8 Token parseClassBody(Token token) => fullParseClassBody(token); 8 Token parseClassBody(Token token) => fullParseClassBody(token);
9 } 9 }
10 10
11 class PartialClassElement extends ClassElement { 11 class PartialClassElement extends ClassElement {
12 final Token beginToken; 12 final Token beginToken;
13 final Token endToken; 13 final Token endToken;
14 Node cachedNode; 14 Node cachedNode;
15 15
16 PartialClassElement(SourceString name, 16 PartialClassElement(SourceString name,
17 Token this.beginToken, 17 Token this.beginToken,
18 Token this.endToken, 18 Token this.endToken,
19 Element enclosing, 19 Element enclosing,
20 int id) 20 int id)
21 : super(name, enclosing, id); 21 : super(name, enclosing, id, ClassElement.STATE_NOT_STARTED);
22
23 void set supertypeLoadState(int state) {
24 assert(state == supertypeLoadState + 1);
25 assert(state <= ClassElement.STATE_DONE);
26 super.supertypeLoadState = state;
27 }
28
29 void set resolutionState(int state) {
30 assert(state == resolutionState + 1);
31 assert(state <= ClassElement.STATE_DONE);
32 super.resolutionState = state;
33 }
22 34
23 ClassNode parseNode(DiagnosticListener diagnosticListener) { 35 ClassNode parseNode(DiagnosticListener diagnosticListener) {
24 if (cachedNode != null) return cachedNode; 36 if (cachedNode != null) return cachedNode;
25 // TODO(ahe): Measure these tasks. 37 // TODO(ahe): Measure these tasks.
26 MemberListener listener = new MemberListener(diagnosticListener, this); 38 MemberListener listener = new MemberListener(diagnosticListener, this);
27 Parser parser = new ClassElementParser(listener); 39 Parser parser = new ClassElementParser(listener);
28 Token token = parser.parseTopLevelDeclaration(beginToken); 40 Token token = parser.parseTopLevelDeclaration(beginToken);
29 assert(token === endToken.next); 41 assert(token === endToken.next);
30 cachedNode = listener.popNode(); 42 cachedNode = listener.popNode();
31 assert(listener.nodes.isEmpty()); 43 assert(listener.nodes.isEmpty());
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 } 179 }
168 180
169 void endInitializers(int count, Token beginToken, Token endToken) { 181 void endInitializers(int count, Token beginToken, Token endToken) {
170 pushNode(null); 182 pushNode(null);
171 } 183 }
172 184
173 void addMember(Element memberElement) { 185 void addMember(Element memberElement) {
174 enclosingElement.addMember(memberElement, listener); 186 enclosingElement.addMember(memberElement, listener);
175 } 187 }
176 } 188 }
OLDNEW
« no previous file with comments | « dart/lib/compiler/implementation/elements/elements.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698