languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-15 22:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename parseCombinators to parseCombinatorStar

Browse source 
Change-Id: I5caac387a90c9a103182901ac8a1d2a3283e6440
Reviewed-on: https://dart-review.googlesource.com/30501
Reviewed-by: Dan Rubel <danrubel@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Brian Wilkerson 2017-12-19 17:37:16 +00:00 committed by commit-bot@chromium.org
parent 3c74884ebb
commit d973fb3bca
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/analyzer/lib/src/generated/parser_fasta.dart
View file

@ -130,7 +130,7 @@ abstract class ParserAdapter implements Parser {
@override
List<Combinator> parseCombinators() {
currentToken = fastaParser
.parseCombinators(fastaParser.syntheticPreviousToken(currentToken))
.parseCombinatorStar(fastaParser.syntheticPreviousToken(currentToken))
.next;
return astBuilder.pop();
}

11
pkg/front_end/lib/src/fasta/parser/parser.dart
View file

@ -597,7 +597,7 @@ class Parser {
Token uri = token;
token = parseConditionalUris(token);
token = parseImportPrefixOpt(token);
token = parseCombinators(token).next;
token = parseCombinatorStar(token).next;
if (optional(';', token)) {
listener.endImport(importKeyword, token);
return token;
@ -620,7 +620,7 @@ class Parser {
listener = recoveryListener;
token = parseConditionalUris(token);
token = parseImportPrefixOpt(token);
token = parseCombinators(token);
token = parseCombinatorStar(token);
Token firstDeferredKeyword = recoveryListener.deferredKeyword;
bool hasPrefix = recoveryListener.asKeyword != null;
@ -688,7 +688,7 @@ class Parser {
}
}
token = parseCombinators(token);
token = parseCombinatorStar(token);
hasCombinator = hasCombinator || recoveryListener.hasCombinator;
if (optional(';', token.next)) {
@ -777,7 +777,7 @@ class Parser {
listener.beginExport(exportKeyword);
token = ensureLiteralString(exportKeyword);
token = parseConditionalUris(token);
token = parseCombinators(token);
token = parseCombinatorStar(token);
token = ensureSemicolon(token);
listener.endExport(exportKeyword, token);
return token;
@ -788,8 +788,7 @@ class Parser {
/// (hideCombinator | showCombinator)*
/// ;
/// ```
Token parseCombinators(Token token) {
// TODO(brianwilkerson): Rename to `parseCombinatorsStar`?
Token parseCombinatorStar(Token token) {
Token next = token.next;
listener.beginCombinators(next);
int count = 0;