Use message.yaml in parser.

pkg/front_end/lib/src/fasta/scanner/error_token.dart

Index: pkg/front_end/lib/src/fasta/scanner/error_token.dart
diff --git a/pkg/front_end/lib/src/fasta/scanner/error_token.dart b/pkg/front_end/lib/src/fasta/scanner/error_token.dart
index 882d35b5cc6a937363578d93659231eb74c449ed..cb03154589a8b6846a7330345536d95017867028 100644
--- a/pkg/front_end/lib/src/fasta/scanner/error_token.dart
+++ b/pkg/front_end/lib/src/fasta/scanner/error_token.dart
@@ -4,17 +4,26 @@
 
 library dart_scanner.error_token;
 
-// TODO(ahe): ErrorKind doesn't belong in dart_parser. Move to compiler_util or
-// this package?
-import '../parser/error_kind.dart' show ErrorKind;
+import '../fasta_codes.dart'
+    show
+        FastaCode,
+        codeAsciiControlCharacter,
+        codeEncoding,
+        codeExpectedHexDigit,
+        codeMissingExponent,
+        codeNonAsciiIdentifier,
+        codeNonAsciiWhitespace,
+        codeUnexpectedDollarInString,
+        codeUnmatchedToken,
+        codeUnterminatedComment,
+        codeUnterminatedString,
+        codeUnterminatedToken;
 
 import '../scanner.dart'
     show BeginGroupToken, Token, unicodeReplacementCharacter;
 
 import 'precedence.dart' show BAD_INPUT_INFO, PrecedenceInfo;
 
-export '../parser/error_kind.dart' show ErrorKind;
-
 ErrorToken buildUnexpectedCharacterToken(int character, int charOffset) {
   if (character < 0x1f) {
     return new AsciiControlCharacterToken(character, charOffset);
@@ -70,7 +79,7 @@ abstract class ErrorToken extends Token {
 
   String get assertionMessage;
 
-  ErrorKind get errorCode;
+  FastaCode get errorCode;
 
   int get character => null;
 
@@ -94,7 +103,7 @@ class EncodingErrorToken extends ErrorToken {
 
   String get assertionMessage => "Unable to decode bytes as UTF-8.";
 
-  ErrorKind get errorCode => ErrorKind.Encoding;
+  FastaCode get errorCode => codeEncoding;
 }
 
 /// Represents a non-ASCII character outside a string or comment.
@@ -116,7 +125,7 @@ class NonAsciiIdentifierToken extends ErrorToken {
         " or '\$' (a dollar sign).";
   }
 
-  ErrorKind get errorCode => ErrorKind.NonAsciiIdentifier;
+  FastaCode get errorCode => codeNonAsciiIdentifier;
 }
 
 /// Represents a non-ASCII whitespace outside a string or comment.
@@ -133,7 +142,7 @@ class NonAsciiWhitespaceToken extends ErrorToken {
         "and comments.";
   }
 
-  ErrorKind get errorCode => ErrorKind.NonAsciiWhitespace;
+  FastaCode get errorCode => codeNonAsciiWhitespace;
 }
 
 /// Represents an ASCII control character outside a string or comment.
@@ -151,7 +160,7 @@ class AsciiControlCharacterToken extends ErrorToken {
         "comments.";
   }
 
-  ErrorKind get errorCode => ErrorKind.AsciiControlCharacter;
+  FastaCode get errorCode => codeAsciiControlCharacter;
 }
 
 /// Represents an unterminated string.
@@ -168,10 +177,10 @@ class UnterminatedToken extends ErrorToken {
 
   int get charCount => endOffset - charOffset;
 
-  ErrorKind get errorCode {
+  FastaCode get errorCode {
     switch (start) {
       case '1e':
-        return ErrorKind.MissingExponent;
+        return codeMissingExponent;
 
       case '"':
       case "'":
@@ -181,19 +190,19 @@ class UnterminatedToken extends ErrorToken {
       case "r'":
       case 'r"""':
       case "r'''":
-        return ErrorKind.UnterminatedString;
+        return codeUnterminatedString;
 
       case '0x':
-        return ErrorKind.ExpectedHexDigit;
+        return codeExpectedHexDigit;
 
       case r'$':
-        return ErrorKind.UnexpectedDollarInString;
+        return codeUnexpectedDollarInString;
 
       case '/*':
-        return ErrorKind.UnterminatedComment;
+        return codeUnterminatedComment;
 
       default:
-        return ErrorKind.UnterminatedToken;
+        return codeUnterminatedToken;
     }
   }
 }
@@ -213,5 +222,5 @@ class UnmatchedToken extends ErrorToken {
 
   String get assertionMessage => "'$begin' isn't closed.";
 
-  ErrorKind get errorCode => ErrorKind.UnmatchedToken;
+  FastaCode get errorCode => codeUnmatchedToken;
 }