languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 14:39:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename parseStatementOpt to parseStatement

Browse source 
Change-Id: I0016bfb44843b6cd6dd36bef724fe25e93630224
Reviewed-on: https://dart-review.googlesource.com/30560
Reviewed-by: Dan Rubel <danrubel@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Brian Wilkerson 2017-12-19 20:23:54 +00:00 committed by commit-bot@chromium.org
parent 032cc33fd5
commit cf0b75bc1d
4 changed files with 15 additions and 16 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

@ -270,7 +270,7 @@ abstract class ParserAdapter implements Parser {
@override
Statement parseStatement2() {
currentToken = fastaParser
.parseStatementOpt(fastaParser.syntheticPreviousToken(currentToken))
.parseStatement(fastaParser.syntheticPreviousToken(currentToken))
.next;
return astBuilder.pop();
}

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

@ -4038,7 +4038,7 @@ class Parser {
token = next;
while (notEofOrValue('}', token.next)) {
Token startToken = token.next;
token = parseStatementOpt(token);
token = parseStatement(token);
if (identical(token.next, startToken)) {
// No progress was made, so we report the current token as being invalid
// and move forward.
@ -4108,8 +4108,7 @@ class Parser {
}
int statementDepth = 0;
Token parseStatementOpt(Token token) {
// TODO(brianwilkerson): Rename this to `parseStatement`?
Token parseStatement(Token token) {
if (statementDepth++ > 500) {
// This happens for degenerate programs, for example, a lot of nested
// if-statements. The language test deep_nesting2_negative_test, for
@ -4277,7 +4276,7 @@ class Parser {
labelCount++;
} while (next.isIdentifier && optional(':', next.next));
listener.beginLabeledStatement(next, labelCount);
token = parseStatementOpt(token);
token = parseStatement(token);
listener.endLabeledStatement(labelCount);
return token;
}
@ -5416,13 +5415,13 @@ class Parser {
listener.beginIfStatement(ifToken);
token = parseParenthesizedExpression(ifToken);
listener.beginThenStatement(token.next);
token = parseStatementOpt(token);
token = parseStatement(token);
listener.endThenStatement(token);
Token elseToken = null;
if (optional('else', token.next)) {
elseToken = token.next;
listener.beginElseStatement(elseToken);
token = parseStatementOpt(elseToken);
token = parseStatement(elseToken);
listener.endElseStatement(elseToken);
}
listener.endIfStatement(ifToken, elseToken);
@ -5518,7 +5517,7 @@ class Parser {
}
expect(')', token);
listener.beginForStatementBody(token.next);
token = parseStatementOpt(token);
token = parseStatement(token);
listener.endForStatementBody(token.next);
listener.endForStatement(
forToken, leftParenthesis, leftSeparator, expressionCount, token.next);
@ -5545,7 +5544,7 @@ class Parser {
listener.endForInExpression(token);
expect(')', token);
listener.beginForInBody(token.next);
token = parseStatementOpt(token);
token = parseStatement(token);
listener.endForInBody(token.next);
listener.endForIn(
awaitToken, forKeyword, leftParenthesis, inKeyword, token.next);
@ -5563,7 +5562,7 @@ class Parser {
listener.beginWhileStatement(whileToken);
token = parseParenthesizedExpression(whileToken);
listener.beginWhileStatementBody(token.next);
token = parseStatementOpt(token);
token = parseStatement(token);
listener.endWhileStatementBody(token.next);
listener.endWhileStatement(whileToken, token.next);
return token;
@ -5579,7 +5578,7 @@ class Parser {
assert(optional('do', doToken));
listener.beginDoWhileStatement(doToken);
listener.beginDoWhileStatementBody(doToken.next);
token = parseStatementOpt(doToken).next;
token = parseStatement(doToken).next;
listener.endDoWhileStatementBody(token);
Token whileToken = token;
expect('while', token);
@ -5600,7 +5599,7 @@ class Parser {
int statementCount = 0;
while (notEofOrValue('}', token.next)) {
Token startToken = token.next;
token = parseStatementOpt(token);
token = parseStatement(token);
if (identical(token.next, startToken)) {
// No progress was made, so we report the current token as being invalid
// and move forward.
@ -5881,7 +5880,7 @@ class Parser {
break;
} else {
Token startToken = token.next;
token = parseStatementOpt(token);
token = parseStatement(token);
Token next = token.next;
if (identical(next, startToken)) {
// No progress was made, so we report the current token as being

2
tests/compiler/dart2js/parser_helper.dart
View file

@ -118,7 +118,7 @@ Node parseBodyCode(String text, Function parseMethod,
Node parseStatement(String text) => parseBodyCode(
text,
(parser, tokens) =>
parser.parseStatementOpt(parser.syntheticPreviousToken(tokens)));
parser.parseStatement(parser.syntheticPreviousToken(tokens)));
Node parseFunction(String text, MockCompiler compiler) {
ElementX element = parseUnit(text, compiler, compiler.mainApp).head;

4
tests/compiler/dart2js/type_checker_test.dart
View file

@ -2562,7 +2562,7 @@ analyze(MockCompiler compiler, String text,
NodeListener listener =
new NodeListener(const ScannerOptions(), compiler.reporter, null);
Parser parser = new Parser(listener);
parser.parseStatementOpt(parser.syntheticPreviousToken(tokens));
parser.parseStatement(parser.syntheticPreviousToken(tokens));
Node node = listener.popNode();
Element compilationUnit = new CompilationUnitElementX(
new Script(null, null, null), compiler.mainApp);
@ -2607,7 +2607,7 @@ analyzeIn(MockCompiler compiler, FunctionElement element, String text,
new NodeListener(const ScannerOptions(), compiler.reporter, null);
Parser parser = new Parser(listener)
..asyncState = element.asyncMarker.asyncParserState;
parser.parseStatementOpt(parser.syntheticPreviousToken(tokens));
parser.parseStatement(parser.syntheticPreviousToken(tokens));
Node node = listener.popNode();
TreeElements elements = compiler.resolveNodeStatement(node, element);
TypeCheckerVisitor checker =