| OLD | NEW |
| 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 addMember(memberElement); | 158 addMember(memberElement); |
| 159 } | 159 } |
| 160 | 160 |
| 161 void endFields(int count, Token beginToken, Token endToken) { | 161 void endFields(int count, Token beginToken, Token endToken) { |
| 162 super.endFields(count, beginToken, endToken); | 162 super.endFields(count, beginToken, endToken); |
| 163 VariableDefinitions variableDefinitions = popNode(); | 163 VariableDefinitions variableDefinitions = popNode(); |
| 164 Modifiers modifiers = variableDefinitions.modifiers; | 164 Modifiers modifiers = variableDefinitions.modifiers; |
| 165 pushNode(null); | 165 pushNode(null); |
| 166 void buildFieldElement(String name, Element fields) { | 166 void buildFieldElement(String name, Element fields) { |
| 167 Element element = | 167 Element element = |
| 168 new VariableElementX(name, fields, ElementKind.FIELD, null); | 168 new FieldElementX(name, fields, null); |
| 169 addMember(element); | 169 addMember(element); |
| 170 } | 170 } |
| 171 buildFieldElements(modifiers, variableDefinitions.definitions, | 171 buildFieldElements(modifiers, variableDefinitions.definitions, |
| 172 enclosingElement, | 172 enclosingElement, |
| 173 buildFieldElement, beginToken, endToken); | 173 buildFieldElement, beginToken, endToken); |
| 174 } | 174 } |
| 175 | 175 |
| 176 void endInitializer(Token assignmentOperator) { | 176 void endInitializer(Token assignmentOperator) { |
| 177 pushNode(null); // Super expects an expression, but | 177 pushNode(null); // Super expects an expression, but |
| 178 // ClassElementParser just skips expressions. | 178 // ClassElementParser just skips expressions. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 193 | 193 |
| 194 void endMetadata(Token beginToken, Token periodBeforeName, Token endToken) { | 194 void endMetadata(Token beginToken, Token periodBeforeName, Token endToken) { |
| 195 popNode(); // Discard arguments. | 195 popNode(); // Discard arguments. |
| 196 if (periodBeforeName != null) { | 196 if (periodBeforeName != null) { |
| 197 popNode(); // Discard name. | 197 popNode(); // Discard name. |
| 198 } | 198 } |
| 199 popNode(); // Discard node (Send or Identifier). | 199 popNode(); // Discard node (Send or Identifier). |
| 200 pushMetadata(new PartialMetadataAnnotation(beginToken, endToken)); | 200 pushMetadata(new PartialMetadataAnnotation(beginToken, endToken)); |
| 201 } | 201 } |
| 202 } | 202 } |
| OLD | NEW |