Index: pkg/compiler/lib/src/tokens/precedence_constants.dart |
diff --git a/pkg/compiler/lib/src/tokens/precedence_constants.dart b/pkg/compiler/lib/src/tokens/precedence_constants.dart |
index f2e44f28282800fe4debf1b07dc02866f4734140..08475ec6754be67a8899ba73387212f0956f5875 100644 |
--- a/pkg/compiler/lib/src/tokens/precedence_constants.dart |
+++ b/pkg/compiler/lib/src/tokens/precedence_constants.dart |
@@ -4,18 +4,16 @@ |
library dart2js.tokens.precedence.constants; |
-import 'precedence.dart' show |
- PrecedenceInfo; |
+import 'precedence.dart' show PrecedenceInfo; |
import 'token_constants.dart'; |
// TODO(ahe): The following are not tokens in Dart. |
const PrecedenceInfo BACKPING_INFO = |
- const PrecedenceInfo('`', 0, BACKPING_TOKEN); |
+ const PrecedenceInfo('`', 0, BACKPING_TOKEN); |
const PrecedenceInfo BACKSLASH_INFO = |
- const PrecedenceInfo('\\', 0, BACKSLASH_TOKEN); |
+ const PrecedenceInfo('\\', 0, BACKSLASH_TOKEN); |
const PrecedenceInfo PERIOD_PERIOD_PERIOD_INFO = |
- const PrecedenceInfo('...', 0, |
- PERIOD_PERIOD_PERIOD_TOKEN); |
+ const PrecedenceInfo('...', 0, PERIOD_PERIOD_PERIOD_TOKEN); |
/** |
* The cascade operator has the lowest precedence of any operator |
@@ -23,219 +21,169 @@ const PrecedenceInfo PERIOD_PERIOD_PERIOD_INFO = |
*/ |
const int CASCADE_PRECEDENCE = 2; |
const PrecedenceInfo PERIOD_PERIOD_INFO = |
- const PrecedenceInfo('..', CASCADE_PRECEDENCE, |
- PERIOD_PERIOD_TOKEN); |
- |
-const PrecedenceInfo BANG_INFO = |
- const PrecedenceInfo('!', 0, BANG_TOKEN); |
-const PrecedenceInfo COLON_INFO = |
- const PrecedenceInfo(':', 0, COLON_TOKEN); |
-const PrecedenceInfo INDEX_INFO = |
- const PrecedenceInfo('[]', 0, INDEX_TOKEN); |
+ const PrecedenceInfo('..', CASCADE_PRECEDENCE, PERIOD_PERIOD_TOKEN); |
+ |
+const PrecedenceInfo BANG_INFO = const PrecedenceInfo('!', 0, BANG_TOKEN); |
+const PrecedenceInfo COLON_INFO = const PrecedenceInfo(':', 0, COLON_TOKEN); |
+const PrecedenceInfo INDEX_INFO = const PrecedenceInfo('[]', 0, INDEX_TOKEN); |
const PrecedenceInfo MINUS_MINUS_INFO = |
- const PrecedenceInfo('--', POSTFIX_PRECEDENCE, |
- MINUS_MINUS_TOKEN); |
+ const PrecedenceInfo('--', POSTFIX_PRECEDENCE, MINUS_MINUS_TOKEN); |
const PrecedenceInfo PLUS_PLUS_INFO = |
- const PrecedenceInfo('++', POSTFIX_PRECEDENCE, |
- PLUS_PLUS_TOKEN); |
-const PrecedenceInfo TILDE_INFO = |
- const PrecedenceInfo('~', 0, TILDE_TOKEN); |
+ const PrecedenceInfo('++', POSTFIX_PRECEDENCE, PLUS_PLUS_TOKEN); |
+const PrecedenceInfo TILDE_INFO = const PrecedenceInfo('~', 0, TILDE_TOKEN); |
const PrecedenceInfo FUNCTION_INFO = |
- const PrecedenceInfo('=>', 0, FUNCTION_TOKEN); |
-const PrecedenceInfo HASH_INFO = |
- const PrecedenceInfo('#', 0, HASH_TOKEN); |
+ const PrecedenceInfo('=>', 0, FUNCTION_TOKEN); |
+const PrecedenceInfo HASH_INFO = const PrecedenceInfo('#', 0, HASH_TOKEN); |
const PrecedenceInfo INDEX_EQ_INFO = |
- const PrecedenceInfo('[]=', 0, INDEX_EQ_TOKEN); |
+ const PrecedenceInfo('[]=', 0, INDEX_EQ_TOKEN); |
const PrecedenceInfo SEMICOLON_INFO = |
- const PrecedenceInfo(';', 0, SEMICOLON_TOKEN); |
-const PrecedenceInfo COMMA_INFO = |
- const PrecedenceInfo(',', 0, COMMA_TOKEN); |
+ const PrecedenceInfo(';', 0, SEMICOLON_TOKEN); |
+const PrecedenceInfo COMMA_INFO = const PrecedenceInfo(',', 0, COMMA_TOKEN); |
-const PrecedenceInfo AT_INFO = |
- const PrecedenceInfo('@', 0, AT_TOKEN); |
+const PrecedenceInfo AT_INFO = const PrecedenceInfo('@', 0, AT_TOKEN); |
// Assignment operators. |
const int ASSIGNMENT_PRECEDENCE = 1; |
const PrecedenceInfo AMPERSAND_EQ_INFO = |
- const PrecedenceInfo('&=', |
- ASSIGNMENT_PRECEDENCE, AMPERSAND_EQ_TOKEN); |
+ const PrecedenceInfo('&=', ASSIGNMENT_PRECEDENCE, AMPERSAND_EQ_TOKEN); |
const PrecedenceInfo BAR_EQ_INFO = |
- const PrecedenceInfo('|=', |
- ASSIGNMENT_PRECEDENCE, BAR_EQ_TOKEN); |
+ const PrecedenceInfo('|=', ASSIGNMENT_PRECEDENCE, BAR_EQ_TOKEN); |
const PrecedenceInfo CARET_EQ_INFO = |
- const PrecedenceInfo('^=', |
- ASSIGNMENT_PRECEDENCE, CARET_EQ_TOKEN); |
+ const PrecedenceInfo('^=', ASSIGNMENT_PRECEDENCE, CARET_EQ_TOKEN); |
const PrecedenceInfo EQ_INFO = |
- const PrecedenceInfo('=', |
- ASSIGNMENT_PRECEDENCE, EQ_TOKEN); |
+ const PrecedenceInfo('=', ASSIGNMENT_PRECEDENCE, EQ_TOKEN); |
const PrecedenceInfo GT_GT_EQ_INFO = |
- const PrecedenceInfo('>>=', |
- ASSIGNMENT_PRECEDENCE, GT_GT_EQ_TOKEN); |
+ const PrecedenceInfo('>>=', ASSIGNMENT_PRECEDENCE, GT_GT_EQ_TOKEN); |
const PrecedenceInfo LT_LT_EQ_INFO = |
- const PrecedenceInfo('<<=', |
- ASSIGNMENT_PRECEDENCE, LT_LT_EQ_TOKEN); |
+ const PrecedenceInfo('<<=', ASSIGNMENT_PRECEDENCE, LT_LT_EQ_TOKEN); |
const PrecedenceInfo MINUS_EQ_INFO = |
- const PrecedenceInfo('-=', |
- ASSIGNMENT_PRECEDENCE, MINUS_EQ_TOKEN); |
+ const PrecedenceInfo('-=', ASSIGNMENT_PRECEDENCE, MINUS_EQ_TOKEN); |
const PrecedenceInfo PERCENT_EQ_INFO = |
- const PrecedenceInfo('%=', |
- ASSIGNMENT_PRECEDENCE, PERCENT_EQ_TOKEN); |
+ const PrecedenceInfo('%=', ASSIGNMENT_PRECEDENCE, PERCENT_EQ_TOKEN); |
const PrecedenceInfo PLUS_EQ_INFO = |
- const PrecedenceInfo('+=', |
- ASSIGNMENT_PRECEDENCE, PLUS_EQ_TOKEN); |
+ const PrecedenceInfo('+=', ASSIGNMENT_PRECEDENCE, PLUS_EQ_TOKEN); |
const PrecedenceInfo SLASH_EQ_INFO = |
- const PrecedenceInfo('/=', |
- ASSIGNMENT_PRECEDENCE, SLASH_EQ_TOKEN); |
+ const PrecedenceInfo('/=', ASSIGNMENT_PRECEDENCE, SLASH_EQ_TOKEN); |
const PrecedenceInfo STAR_EQ_INFO = |
- const PrecedenceInfo('*=', |
- ASSIGNMENT_PRECEDENCE, STAR_EQ_TOKEN); |
+ const PrecedenceInfo('*=', ASSIGNMENT_PRECEDENCE, STAR_EQ_TOKEN); |
const PrecedenceInfo TILDE_SLASH_EQ_INFO = |
- const PrecedenceInfo('~/=', |
- ASSIGNMENT_PRECEDENCE, TILDE_SLASH_EQ_TOKEN); |
-const PrecedenceInfo QUESTION_QUESTION_EQ_INFO = |
- const PrecedenceInfo('??=', |
- ASSIGNMENT_PRECEDENCE, QUESTION_QUESTION_EQ_TOKEN); |
+ const PrecedenceInfo('~/=', ASSIGNMENT_PRECEDENCE, TILDE_SLASH_EQ_TOKEN); |
+const PrecedenceInfo QUESTION_QUESTION_EQ_INFO = const PrecedenceInfo( |
+ '??=', ASSIGNMENT_PRECEDENCE, QUESTION_QUESTION_EQ_TOKEN); |
const PrecedenceInfo QUESTION_INFO = |
- const PrecedenceInfo('?', 3, QUESTION_TOKEN); |
+ const PrecedenceInfo('?', 3, QUESTION_TOKEN); |
const PrecedenceInfo QUESTION_QUESTION_INFO = |
- const PrecedenceInfo('??', 4, QUESTION_QUESTION_TOKEN); |
+ const PrecedenceInfo('??', 4, QUESTION_QUESTION_TOKEN); |
const PrecedenceInfo BAR_BAR_INFO = |
- const PrecedenceInfo('||', 5, BAR_BAR_TOKEN); |
+ const PrecedenceInfo('||', 5, BAR_BAR_TOKEN); |
const PrecedenceInfo AMPERSAND_AMPERSAND_INFO = |
- const PrecedenceInfo('&&', 6, AMPERSAND_AMPERSAND_TOKEN); |
+ const PrecedenceInfo('&&', 6, AMPERSAND_AMPERSAND_TOKEN); |
-const PrecedenceInfo BAR_INFO = |
- const PrecedenceInfo('|', 9, BAR_TOKEN); |
+const PrecedenceInfo BAR_INFO = const PrecedenceInfo('|', 9, BAR_TOKEN); |
-const PrecedenceInfo CARET_INFO = |
- const PrecedenceInfo('^', 10, CARET_TOKEN); |
+const PrecedenceInfo CARET_INFO = const PrecedenceInfo('^', 10, CARET_TOKEN); |
const PrecedenceInfo AMPERSAND_INFO = |
- const PrecedenceInfo('&', 11, AMPERSAND_TOKEN); |
+ const PrecedenceInfo('&', 11, AMPERSAND_TOKEN); |
// Equality operators. |
const int EQUALITY_PRECEDENCE = 7; |
const PrecedenceInfo BANG_EQ_EQ_INFO = |
- const PrecedenceInfo('!==', |
- EQUALITY_PRECEDENCE, BANG_EQ_EQ_TOKEN); |
+ const PrecedenceInfo('!==', EQUALITY_PRECEDENCE, BANG_EQ_EQ_TOKEN); |
const PrecedenceInfo BANG_EQ_INFO = |
- const PrecedenceInfo('!=', |
- EQUALITY_PRECEDENCE, BANG_EQ_TOKEN); |
+ const PrecedenceInfo('!=', EQUALITY_PRECEDENCE, BANG_EQ_TOKEN); |
const PrecedenceInfo EQ_EQ_EQ_INFO = |
- const PrecedenceInfo('===', |
- EQUALITY_PRECEDENCE, EQ_EQ_EQ_TOKEN); |
+ const PrecedenceInfo('===', EQUALITY_PRECEDENCE, EQ_EQ_EQ_TOKEN); |
const PrecedenceInfo EQ_EQ_INFO = |
- const PrecedenceInfo('==', |
- EQUALITY_PRECEDENCE, EQ_EQ_TOKEN); |
+ const PrecedenceInfo('==', EQUALITY_PRECEDENCE, EQ_EQ_TOKEN); |
// Relational operators. |
const int RELATIONAL_PRECEDENCE = 8; |
const PrecedenceInfo GT_EQ_INFO = |
- const PrecedenceInfo('>=', |
- RELATIONAL_PRECEDENCE, GT_EQ_TOKEN); |
+ const PrecedenceInfo('>=', RELATIONAL_PRECEDENCE, GT_EQ_TOKEN); |
const PrecedenceInfo GT_INFO = |
- const PrecedenceInfo('>', |
- RELATIONAL_PRECEDENCE, GT_TOKEN); |
+ const PrecedenceInfo('>', RELATIONAL_PRECEDENCE, GT_TOKEN); |
const PrecedenceInfo IS_INFO = |
- const PrecedenceInfo('is', |
- RELATIONAL_PRECEDENCE, KEYWORD_TOKEN); |
+ const PrecedenceInfo('is', RELATIONAL_PRECEDENCE, KEYWORD_TOKEN); |
const PrecedenceInfo AS_INFO = |
- const PrecedenceInfo('as', |
- RELATIONAL_PRECEDENCE, KEYWORD_TOKEN); |
+ const PrecedenceInfo('as', RELATIONAL_PRECEDENCE, KEYWORD_TOKEN); |
const PrecedenceInfo LT_EQ_INFO = |
- const PrecedenceInfo('<=', |
- RELATIONAL_PRECEDENCE, LT_EQ_TOKEN); |
+ const PrecedenceInfo('<=', RELATIONAL_PRECEDENCE, LT_EQ_TOKEN); |
const PrecedenceInfo LT_INFO = |
- const PrecedenceInfo('<', |
- RELATIONAL_PRECEDENCE, LT_TOKEN); |
+ const PrecedenceInfo('<', RELATIONAL_PRECEDENCE, LT_TOKEN); |
// Shift operators. |
-const PrecedenceInfo GT_GT_INFO = |
- const PrecedenceInfo('>>', 12, GT_GT_TOKEN); |
-const PrecedenceInfo LT_LT_INFO = |
- const PrecedenceInfo('<<', 12, LT_LT_TOKEN); |
+const PrecedenceInfo GT_GT_INFO = const PrecedenceInfo('>>', 12, GT_GT_TOKEN); |
+const PrecedenceInfo LT_LT_INFO = const PrecedenceInfo('<<', 12, LT_LT_TOKEN); |
// Additive operators. |
-const PrecedenceInfo MINUS_INFO = |
- const PrecedenceInfo('-', 13, MINUS_TOKEN); |
-const PrecedenceInfo PLUS_INFO = |
- const PrecedenceInfo('+', 13, PLUS_TOKEN); |
+const PrecedenceInfo MINUS_INFO = const PrecedenceInfo('-', 13, MINUS_TOKEN); |
+const PrecedenceInfo PLUS_INFO = const PrecedenceInfo('+', 13, PLUS_TOKEN); |
// Multiplicative operators. |
const PrecedenceInfo PERCENT_INFO = |
- const PrecedenceInfo('%', 14, PERCENT_TOKEN); |
-const PrecedenceInfo SLASH_INFO = |
- const PrecedenceInfo('/', 14, SLASH_TOKEN); |
-const PrecedenceInfo STAR_INFO = |
- const PrecedenceInfo('*', 14, STAR_TOKEN); |
+ const PrecedenceInfo('%', 14, PERCENT_TOKEN); |
+const PrecedenceInfo SLASH_INFO = const PrecedenceInfo('/', 14, SLASH_TOKEN); |
+const PrecedenceInfo STAR_INFO = const PrecedenceInfo('*', 14, STAR_TOKEN); |
const PrecedenceInfo TILDE_SLASH_INFO = |
- const PrecedenceInfo('~/', 14, TILDE_SLASH_TOKEN); |
+ const PrecedenceInfo('~/', 14, TILDE_SLASH_TOKEN); |
const int POSTFIX_PRECEDENCE = 15; |
const PrecedenceInfo PERIOD_INFO = |
- const PrecedenceInfo('.', POSTFIX_PRECEDENCE, |
- PERIOD_TOKEN); |
+ const PrecedenceInfo('.', POSTFIX_PRECEDENCE, PERIOD_TOKEN); |
const PrecedenceInfo QUESTION_PERIOD_INFO = |
- const PrecedenceInfo('?.', POSTFIX_PRECEDENCE, |
- QUESTION_PERIOD_TOKEN); |
+ const PrecedenceInfo('?.', POSTFIX_PRECEDENCE, QUESTION_PERIOD_TOKEN); |
const PrecedenceInfo KEYWORD_INFO = |
- const PrecedenceInfo('keyword', 0, KEYWORD_TOKEN); |
+ const PrecedenceInfo('keyword', 0, KEYWORD_TOKEN); |
-const PrecedenceInfo EOF_INFO = |
- const PrecedenceInfo('EOF', 0, EOF_TOKEN); |
+const PrecedenceInfo EOF_INFO = const PrecedenceInfo('EOF', 0, EOF_TOKEN); |
const PrecedenceInfo IDENTIFIER_INFO = |
- const PrecedenceInfo('identifier', 0, IDENTIFIER_TOKEN); |
+ const PrecedenceInfo('identifier', 0, IDENTIFIER_TOKEN); |
const PrecedenceInfo BAD_INPUT_INFO = |
- const PrecedenceInfo('malformed input', 0, |
- BAD_INPUT_TOKEN); |
+ const PrecedenceInfo('malformed input', 0, BAD_INPUT_TOKEN); |
const PrecedenceInfo OPEN_PAREN_INFO = |
- const PrecedenceInfo('(', POSTFIX_PRECEDENCE, |
- OPEN_PAREN_TOKEN); |
+ const PrecedenceInfo('(', POSTFIX_PRECEDENCE, OPEN_PAREN_TOKEN); |
const PrecedenceInfo CLOSE_PAREN_INFO = |
- const PrecedenceInfo(')', 0, CLOSE_PAREN_TOKEN); |
+ const PrecedenceInfo(')', 0, CLOSE_PAREN_TOKEN); |
const PrecedenceInfo OPEN_CURLY_BRACKET_INFO = |
- const PrecedenceInfo('{', 0, OPEN_CURLY_BRACKET_TOKEN); |
+ const PrecedenceInfo('{', 0, OPEN_CURLY_BRACKET_TOKEN); |
const PrecedenceInfo CLOSE_CURLY_BRACKET_INFO = |
- const PrecedenceInfo('}', 0, CLOSE_CURLY_BRACKET_TOKEN); |
+ const PrecedenceInfo('}', 0, CLOSE_CURLY_BRACKET_TOKEN); |
-const PrecedenceInfo INT_INFO = |
- const PrecedenceInfo('int', 0, INT_TOKEN); |
+const PrecedenceInfo INT_INFO = const PrecedenceInfo('int', 0, INT_TOKEN); |
const PrecedenceInfo STRING_INFO = |
- const PrecedenceInfo('string', 0, STRING_TOKEN); |
+ const PrecedenceInfo('string', 0, STRING_TOKEN); |
const PrecedenceInfo OPEN_SQUARE_BRACKET_INFO = |
- const PrecedenceInfo('[', POSTFIX_PRECEDENCE, |
- OPEN_SQUARE_BRACKET_TOKEN); |
+ const PrecedenceInfo('[', POSTFIX_PRECEDENCE, OPEN_SQUARE_BRACKET_TOKEN); |
const PrecedenceInfo CLOSE_SQUARE_BRACKET_INFO = |
- const PrecedenceInfo(']', 0, CLOSE_SQUARE_BRACKET_TOKEN); |
+ const PrecedenceInfo(']', 0, CLOSE_SQUARE_BRACKET_TOKEN); |
const PrecedenceInfo DOUBLE_INFO = |
- const PrecedenceInfo('double', 0, DOUBLE_TOKEN); |
+ const PrecedenceInfo('double', 0, DOUBLE_TOKEN); |
const PrecedenceInfo STRING_INTERPOLATION_INFO = |
- const PrecedenceInfo('\${', 0, |
- STRING_INTERPOLATION_TOKEN); |
+ const PrecedenceInfo('\${', 0, STRING_INTERPOLATION_TOKEN); |
const PrecedenceInfo STRING_INTERPOLATION_IDENTIFIER_INFO = |
- const PrecedenceInfo('\$', 0, |
- STRING_INTERPOLATION_IDENTIFIER_TOKEN); |
+ const PrecedenceInfo('\$', 0, STRING_INTERPOLATION_IDENTIFIER_TOKEN); |
const PrecedenceInfo HEXADECIMAL_INFO = |
- const PrecedenceInfo('hexadecimal', 0, HEXADECIMAL_TOKEN); |
+ const PrecedenceInfo('hexadecimal', 0, HEXADECIMAL_TOKEN); |
const PrecedenceInfo COMMENT_INFO = |
- const PrecedenceInfo('comment', 0, COMMENT_TOKEN); |
+ const PrecedenceInfo('comment', 0, COMMENT_TOKEN); |