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

Unified Diff: pkg/analyzer/lib/src/generated/parser.dart

Issue 515543002: New analyzer snapshot. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analyzer/pubspec.yaml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/parser.dart
diff --git a/pkg/analyzer/lib/src/generated/parser.dart b/pkg/analyzer/lib/src/generated/parser.dart
index 627d5f1cdf01c94fa03289e9ffb651ec0d5b1004..c003da1021244a351d2dbb1037e574fe135fea9d 100644
--- a/pkg/analyzer/lib/src/generated/parser.dart
+++ b/pkg/analyzer/lib/src/generated/parser.dart
@@ -1500,6 +1500,11 @@ class Parser {
Token _currentToken;
/**
+ * A flag indicating whether the parser is currently in a function body marked as being 'async'.
+ */
+ bool _inAsync = false;
+
+ /**
* A flag indicating whether the parser is currently in the body of a loop.
*/
bool _inLoop = false;
@@ -4918,8 +4923,10 @@ class Parser {
* @return the function body that was parsed
*/
FunctionBody _parseFunctionBody(bool mayBeEmpty, ParserErrorCode emptyErrorCode, bool inExpression) {
+ bool wasInAsync = _inAsync;
bool wasInLoop = _inLoop;
bool wasInSwitch = _inSwitch;
+ _inAsync = false;
_inLoop = false;
_inSwitch = false;
try {
@@ -4944,6 +4951,7 @@ class Parser {
if (_matches(TokenType.STAR)) {
star = andAdvance;
}
+ _inAsync = true;
} else if (_matchesString(SYNC)) {
keyword = andAdvance;
if (_matches(TokenType.STAR)) {
@@ -4987,6 +4995,7 @@ class Parser {
return new EmptyFunctionBody(_createSyntheticToken(TokenType.SEMICOLON));
}
} finally {
+ _inAsync = wasInAsync;
_inLoop = wasInLoop;
_inSwitch = wasInSwitch;
}
@@ -5770,10 +5779,13 @@ class Parser {
_reportErrorForCurrentToken(ParserErrorCode.MISSING_STATEMENT, []);
return new EmptyStatement(_createSyntheticToken(TokenType.SEMICOLON));
}
- } else if (_parseAsync && _matchesString(_YIELD)) {
+ } else if (_inAsync && _matchesString(_YIELD)) {
return _parseYieldStatement();
- } else if (_parseAsync && _matchesString(_AWAIT) && _tokenMatchesKeyword(_peek(), Keyword.FOR)) {
- return _parseForStatement();
+ } else if (_inAsync && _matchesString(_AWAIT)) {
+ if (_tokenMatchesKeyword(_peek(), Keyword.FOR)) {
+ return _parseForStatement();
+ }
+ return new ExpressionStatement(parseExpression2(), _expect(TokenType.SEMICOLON));
} else if (_matches(TokenType.SEMICOLON)) {
return _parseEmptyStatement();
} else if (_isInitializedVariableDeclaration()) {
@@ -6589,7 +6601,7 @@ class Parser {
} else if (_matches(TokenType.PLUS)) {
_reportErrorForCurrentToken(ParserErrorCode.MISSING_IDENTIFIER, []);
return _createSyntheticIdentifier();
- } else if (_parseAsync && _matchesString(_AWAIT)) {
+ } else if (_inAsync && _matchesString(_AWAIT)) {
return _parseAwaitExpression();
}
return _parsePostfixExpression();
« no previous file with comments | « no previous file | pkg/analyzer/pubspec.yaml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698