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

Unified Diff: pkg/front_end/lib/src/fasta/parser/parser.dart

Issue 2872453004: cleanup TokenType var names (Closed)
Patch Set: Created 3 years, 7 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 | « pkg/compiler/lib/src/tree/nodes.dart ('k') | pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/front_end/lib/src/fasta/parser/parser.dart
diff --git a/pkg/front_end/lib/src/fasta/parser/parser.dart b/pkg/front_end/lib/src/fasta/parser/parser.dart
index f1cf87e4b4b12e43085c0b7fbda53a6b45c56033..d3508fc81777fe6db1158e3f698a8d0d48a7d30d 100644
--- a/pkg/front_end/lib/src/fasta/parser/parser.dart
+++ b/pkg/front_end/lib/src/fasta/parser/parser.dart
@@ -293,7 +293,7 @@ class Parser {
}
Token _parseTopLevelDeclaration(Token token) {
- if (identical(token.info, TokenType.SCRIPT_TAG)) {
+ if (identical(token.type, TokenType.SCRIPT_TAG)) {
return parseScript(token);
}
token = parseMetadataStar(token);
@@ -2738,8 +2738,8 @@ class Parser {
assert(precedence >= 1);
assert(precedence <= POSTFIX_PRECEDENCE);
token = parseUnaryExpression(token, allowCascades);
- TokenType info = token.info;
- int tokenLevel = info.precedence;
+ TokenType type = token.type;
+ int tokenLevel = type.precedence;
for (int level = tokenLevel; level >= precedence; --level) {
while (identical(tokenLevel, level)) {
Token operator = token;
@@ -2755,8 +2755,8 @@ class Parser {
token = parsePrecedenceExpression(token.next, level, allowCascades);
listener.handleAssignmentExpression(operator);
} else if (identical(tokenLevel, POSTFIX_PRECEDENCE)) {
- if (identical(info, TokenType.PERIOD) ||
- identical(info, TokenType.QUESTION_PERIOD)) {
+ if (identical(type, TokenType.PERIOD) ||
+ identical(type, TokenType.QUESTION_PERIOD)) {
// Left associative, so we recurse at the next higher precedence
// level. However, POSTFIX_PRECEDENCE is the highest level, so we
// should just call [parseUnaryExpression] directly. However, a
@@ -2765,21 +2765,21 @@ class Parser {
token = parsePrimary(
token.next, IdentifierContext.expressionContinuation);
listener.handleBinaryExpression(operator);
- } else if ((identical(info, TokenType.OPEN_PAREN)) ||
- (identical(info, TokenType.OPEN_SQUARE_BRACKET))) {
+ } else if ((identical(type, TokenType.OPEN_PAREN)) ||
+ (identical(type, TokenType.OPEN_SQUARE_BRACKET))) {
token = parseArgumentOrIndexStar(token);
- } else if ((identical(info, TokenType.PLUS_PLUS)) ||
- (identical(info, TokenType.MINUS_MINUS))) {
+ } else if ((identical(type, TokenType.PLUS_PLUS)) ||
+ (identical(type, TokenType.MINUS_MINUS))) {
listener.handleUnaryPostfixAssignmentExpression(token);
token = token.next;
} else {
token = reportUnexpectedToken(token).next;
}
- } else if (identical(info, TokenType.IS)) {
+ } else if (identical(type, TokenType.IS)) {
token = parseIsOperatorRest(token);
- } else if (identical(info, TokenType.AS)) {
+ } else if (identical(type, TokenType.AS)) {
token = parseAsOperatorRest(token);
- } else if (identical(info, TokenType.QUESTION)) {
+ } else if (identical(type, TokenType.QUESTION)) {
token = parseConditionalExpressionRest(token);
} else {
// Left associative, so we recurse at the next higher
@@ -2789,8 +2789,8 @@ class Parser {
parsePrecedenceExpression(token.next, level + 1, allowCascades);
listener.handleBinaryExpression(operator);
}
- info = token.info;
- tokenLevel = info.precedence;
+ type = token.type;
+ tokenLevel = type.precedence;
if (level == EQUALITY_PRECEDENCE || level == RELATIONAL_PRECEDENCE) {
// We don't allow (a == b == c) or (a < b < c).
// Continue the outer loop if we have matched one equality or
@@ -2826,7 +2826,7 @@ class Parser {
token = parseArgumentOrIndexStar(token);
} while (!identical(mark, token));
- if (identical(token.info.precedence, ASSIGNMENT_PRECEDENCE)) {
+ if (identical(token.type.precedence, ASSIGNMENT_PRECEDENCE)) {
Token assignment = token;
token = parseExpressionWithoutCascade(token.next);
listener.handleAssignmentExpression(assignment);
« no previous file with comments | « pkg/compiler/lib/src/tree/nodes.dart ('k') | pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698