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

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

Issue 324293002: Improve parser error recovery. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Addressed Johnni's comments Created 6 years, 6 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) 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 part of scanner; 5 part of scanner;
6 6
7 class ClassElementParser extends PartialParser { 7 class ClassElementParser extends PartialParser {
8 ClassElementParser(Listener listener) : super(listener); 8 ClassElementParser(Listener listener) : super(listener);
9 9
10 Token parseClassBody(Token token) => fullParseClassBody(token); 10 Token parseClassBody(Token token) => fullParseClassBody(token);
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 ElementKind kind = ElementKind.FUNCTION; 167 ElementKind kind = ElementKind.FUNCTION;
168 Element memberElement = new PartialConstructorElement( 168 Element memberElement = new PartialConstructorElement(
169 name, beginToken, endToken, 169 name, beginToken, endToken,
170 ElementKind.FUNCTION, 170 ElementKind.FUNCTION,
171 method.modifiers, 171 method.modifiers,
172 enclosingElement); 172 enclosingElement);
173 addMember(memberElement); 173 addMember(memberElement);
174 } 174 }
175 175
176 void endFields(int count, Token beginToken, Token endToken) { 176 void endFields(int count, Token beginToken, Token endToken) {
177 bool hasParseError = memberErrors.head;
177 super.endFields(count, beginToken, endToken); 178 super.endFields(count, beginToken, endToken);
178 VariableDefinitions variableDefinitions = popNode(); 179 VariableDefinitions variableDefinitions = popNode();
179 Modifiers modifiers = variableDefinitions.modifiers; 180 Modifiers modifiers = variableDefinitions.modifiers;
180 pushNode(null); 181 pushNode(null);
181 void buildFieldElement(Identifier name, VariableList fields) { 182 void buildFieldElement(Identifier name, VariableList fields) {
182 Element element = 183 Element element =
183 new FieldElementX(name, enclosingElement, fields); 184 new FieldElementX(name, enclosingElement, fields);
184 addMember(element); 185 addMember(element);
185 } 186 }
186 buildFieldElements(modifiers, variableDefinitions.definitions, 187 buildFieldElements(modifiers, variableDefinitions.definitions,
187 enclosingElement, 188 enclosingElement,
188 buildFieldElement, beginToken, endToken); 189 buildFieldElement, beginToken, endToken,
190 hasParseError);
189 } 191 }
190 192
191 void endInitializer(Token assignmentOperator) { 193 void endInitializer(Token assignmentOperator) {
192 pushNode(null); // Super expects an expression, but 194 pushNode(null); // Super expects an expression, but
193 // ClassElementParser just skips expressions. 195 // ClassElementParser just skips expressions.
194 super.endInitializer(assignmentOperator); 196 super.endInitializer(assignmentOperator);
195 } 197 }
196 198
197 void endInitializers(int count, Token beginToken, Token endToken) { 199 void endInitializers(int count, Token beginToken, Token endToken) {
198 pushNode(null); 200 pushNode(null);
199 } 201 }
200 202
201 void addMember(Element memberElement) { 203 void addMember(Element memberElement) {
202 for (Link link = metadata; !link.isEmpty; link = link.tail) { 204 for (Link link = metadata; !link.isEmpty; link = link.tail) {
203 memberElement.addMetadata(link.head); 205 memberElement.addMetadata(link.head);
204 } 206 }
205 metadata = const Link<MetadataAnnotation>(); 207 metadata = const Link<MetadataAnnotation>();
206 enclosingElement.addMember(memberElement, listener); 208 enclosingElement.addMember(memberElement, listener);
207 } 209 }
208 210
209 void endMetadata(Token beginToken, Token periodBeforeName, Token endToken) { 211 void endMetadata(Token beginToken, Token periodBeforeName, Token endToken) {
210 popNode(); // Discard arguments. 212 popNode(); // Discard arguments.
211 if (periodBeforeName != null) { 213 if (periodBeforeName != null) {
212 popNode(); // Discard name. 214 popNode(); // Discard name.
213 } 215 }
214 popNode(); // Discard node (Send or Identifier). 216 popNode(); // Discard node (Send or Identifier).
215 pushMetadata(new PartialMetadataAnnotation(beginToken, endToken)); 217 pushMetadata(new PartialMetadataAnnotation(beginToken, endToken));
216 } 218 }
217 } 219 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698