Index: pkg/compiler/lib/src/parser/parser.dart |
diff --git a/pkg/compiler/lib/src/parser/parser.dart b/pkg/compiler/lib/src/parser/parser.dart |
index 69b014f043e870ebd3ea02045e57dbfc01463219..68f96bc363c60187aa22cd6313edd5fb5918061f 100644 |
--- a/pkg/compiler/lib/src/parser/parser.dart |
+++ b/pkg/compiler/lib/src/parser/parser.dart |
@@ -8,50 +8,53 @@ import '../diagnostics/messages.dart' show |
MessageKind; |
import '../tokens/keyword.dart' show |
Keyword; |
-import '../tokens/token.dart' show |
+import '../tokens/precedence.dart' show |
+ PrecedenceInfo; |
+import '../tokens/precedence_constants.dart' show |
AS_INFO, |
ASSIGNMENT_PRECEDENCE, |
- BAD_INPUT_TOKEN, |
- BeginGroupToken, |
CASCADE_PRECEDENCE, |
+ EQUALITY_PRECEDENCE, |
+ GT_INFO, |
+ GT_GT_INFO, |
+ IS_INFO, |
+ MINUS_MINUS_INFO, |
+ OPEN_PAREN_INFO, |
+ OPEN_SQUARE_BRACKET_INFO, |
+ PERIOD_INFO, |
+ PLUS_PLUS_INFO, |
+ POSTFIX_PRECEDENCE, |
+ QUESTION_INFO, |
+ QUESTION_PERIOD_INFO, |
+ RELATIONAL_PRECEDENCE; |
+import '../tokens/token.dart' show |
+ BeginGroupToken, |
+ isUserDefinableOperator, |
+ KeywordToken, |
+ SymbolToken, |
+ Token; |
+import '../tokens/token_constants.dart' show |
+ BAD_INPUT_TOKEN, |
COMMA_TOKEN, |
DOUBLE_TOKEN, |
EOF_TOKEN, |
EQ_TOKEN, |
- EQUALITY_PRECEDENCE, |
FUNCTION_TOKEN, |
- GT_INFO, |
- GT_GT_INFO, |
HASH_TOKEN, |
HEXADECIMAL_TOKEN, |
IDENTIFIER_TOKEN, |
INT_TOKEN, |
- IS_INFO, |
- isUserDefinableOperator, |
KEYWORD_TOKEN, |
- KeywordToken, |
LT_TOKEN, |
- MINUS_MINUS_INFO, |
OPEN_CURLY_BRACKET_TOKEN, |
- OPEN_PAREN_INFO, |
OPEN_PAREN_TOKEN, |
- OPEN_SQUARE_BRACKET_INFO, |
OPEN_SQUARE_BRACKET_TOKEN, |
- PERIOD_INFO, |
PERIOD_TOKEN, |
- PLUS_PLUS_INFO, |
- PrecedenceInfo, |
- POSTFIX_PRECEDENCE, |
- QUESTION_INFO, |
- QUESTION_PERIOD_INFO, |
- RELATIONAL_PRECEDENCE, |
SEMICOLON_TOKEN, |
STRING_INTERPOLATION_IDENTIFIER_TOKEN, |
STRING_INTERPOLATION_TOKEN, |
- STRING_TOKEN, |
- SymbolToken, |
- Token; |
-import '../util/characters.dart' show |
+ STRING_TOKEN; |
+import '../util/characters.dart' as Characters show |
$CLOSE_CURLY_BRACKET; |
import '../util/util.dart' show |
Link; |
@@ -507,7 +510,7 @@ class Parser { |
Token endGroup = beginGroupToken.endGroup; |
if (endGroup == null) { |
return listener.unmatched(beginGroupToken); |
- } else if (!identical(endGroup.kind, $CLOSE_CURLY_BRACKET)) { |
+ } else if (!identical(endGroup.kind, Characters.$CLOSE_CURLY_BRACKET)) { |
return listener.unmatched(beginGroupToken); |
} |
return beginGroupToken.endGroup; |