| OLD | NEW |
| 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, 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 library fasta.diet_parser; | 5 library fasta.diet_parser; |
| 6 | 6 |
| 7 import '../../scanner/token.dart' show BeginToken, Token; |
| 8 |
| 7 import '../fasta_codes.dart' show messageExpectedOpenParens; | 9 import '../fasta_codes.dart' show messageExpectedOpenParens; |
| 8 | 10 |
| 9 import '../parser/class_member_parser.dart' show ClassMemberParser; | 11 import '../parser.dart' show ClassMemberParser, Listener, MemberKind, optional; |
| 10 | |
| 11 import '../parser/listener.dart' show Listener; | |
| 12 | |
| 13 import '../parser/parser.dart' show MemberKind, optional; | |
| 14 | |
| 15 import '../../scanner/token.dart' show BeginToken, Token; | |
| 16 | 12 |
| 17 // TODO(ahe): Move this to parser package. | 13 // TODO(ahe): Move this to parser package. |
| 18 class DietParser extends ClassMemberParser { | 14 class DietParser extends ClassMemberParser { |
| 19 DietParser(Listener listener) : super(listener); | 15 DietParser(Listener listener) : super(listener); |
| 20 | 16 |
| 21 Token parseFormalParameters(Token token, MemberKind kind) { | 17 Token parseFormalParameters(Token token, MemberKind kind) { |
| 22 return skipFormals(token, kind); | 18 return skipFormals(token, kind); |
| 23 } | 19 } |
| 24 | 20 |
| 25 Token skipFormals(Token token, MemberKind kind) { | 21 Token skipFormals(Token token, MemberKind kind) { |
| 26 listener.beginOptionalFormalParameters(token); | 22 listener.beginOptionalFormalParameters(token); |
| 27 if (!optional('(', token)) { | 23 if (!optional('(', token)) { |
| 28 if (optional(';', token)) { | 24 if (optional(';', token)) { |
| 29 reportRecoverableError(token, messageExpectedOpenParens); | 25 reportRecoverableError(token, messageExpectedOpenParens); |
| 30 return token; | 26 return token; |
| 31 } | 27 } |
| 32 return reportUnexpectedToken(token).next; | 28 return reportUnexpectedToken(token).next; |
| 33 } | 29 } |
| 34 BeginToken beginGroupToken = token; | 30 BeginToken beginGroupToken = token; |
| 35 Token endToken = beginGroupToken.endGroup; | 31 Token endToken = beginGroupToken.endGroup; |
| 36 listener.endFormalParameters(0, token, endToken, kind); | 32 listener.endFormalParameters(0, token, endToken, kind); |
| 37 return endToken.next; | 33 return endToken.next; |
| 38 } | 34 } |
| 39 } | 35 } |
| OLD | NEW |