Index: utils/template/tokenkind.dart |
diff --git a/utils/template/tokenkind.dart b/utils/template/tokenkind.dart |
index 6f6ea19ab3cea5f8a650a303f2b38e53d719964a..29da694322dd04e0fb914c80f3ca7b0502dd9d60 100644 |
--- a/utils/template/tokenkind.dart |
+++ b/utils/template/tokenkind.dart |
@@ -312,8 +312,8 @@ class TokenKind { |
int idx = offset; |
bool match = true; |
for (int identIdx = 0; identIdx < ident.length; identIdx++) { |
- int identChar = ident.charCodeAt(identIdx); |
- int char = text.charCodeAt(idx++); |
+ int identChar = ident.codeUnitAt(identIdx); |
+ int char = text.codeUnitAt(idx++); |
// Compare lowercase to lowercase then check if char is uppercase. |
match = match && (char == identChar || |
((char >= ASCII_UPPER_A && char <= ASCII_UPPER_Z) && |
@@ -425,29 +425,29 @@ class TokenKind { |
// All tokens must be in TokenKind order. |
tokens.add(-1); // TokenKind.UNUSED |
tokens.add(0); // TokenKind.END_OF_FILE match base |
- tokens.add(TokenKind.kindToString(TokenKind.LPAREN).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.RPAREN).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.LBRACK).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.RBRACK).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.LBRACE).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.RBRACE).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.DOT).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.SEMICOLON).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.SPACE).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.TAB).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.NEWLINE).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.RETURN).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.COMMA).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.LESS_THAN).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.GREATER_THAN).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.SLASH).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.DOLLAR).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.HASH).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.MINUS).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.EQUAL).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.DOUBLE_QUOTE).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.SINGLE_QUOTE).charCodeAt(0)); |
- tokens.add(TokenKind.kindToString(TokenKind.ASTERISK).charCodeAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.LPAREN).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.RPAREN).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.LBRACK).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.RBRACK).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.LBRACE).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.RBRACE).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.DOT).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.SEMICOLON).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.SPACE).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.TAB).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.NEWLINE).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.RETURN).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.COMMA).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.LESS_THAN).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.GREATER_THAN).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.SLASH).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.DOLLAR).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.HASH).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.MINUS).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.EQUAL).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.DOUBLE_QUOTE).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.SINGLE_QUOTE).codeUnitAt(0)); |
+ tokens.add(TokenKind.kindToString(TokenKind.ASTERISK).codeUnitAt(0)); |
assert(tokens.length == TokenKind.END_TOKENS); |
} |