Use message.yaml in parser.

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.body_builder;
 
+import '../fasta_codes.dart'
+    show FastaMessage, codeExpectedButGot, codeExpectedFunctionBody;
+
 import '../parser/parser.dart' show FormalParameterType, optional;
 
-import '../parser/error_kind.dart' show ErrorKind;
-
 import '../parser/identifier_context.dart' show IdentifierContext;
 
 import 'package:kernel/ast.dart';
 
 import 'package:kernel/clone.dart' show CloneVisitor;
 
 import 'package:kernel/transformations/flags.dart' show TransformerFlag;
 
 import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
 
@@ skipping 2292 matching lines @@
   }
 
   @override
   void handleModifiers(int count) {
     debugEvent("Modifiers");
     // TODO(ahe): Copied from outline_builder.dart.
     push(popList(count) ?? NullValue.Modifiers);
   }
 
   @override
-  void handleRecoverableError(Token token, ErrorKind kind, Map arguments) {
+  void handleRecoverableError(Token token, FastaMessage message) {
     bool silent = hasParserError;
-    super.handleRecoverableError(token, kind, arguments);
-    addCompileTimeError(recoverableErrors.last.beginOffset,
-        '${recoverableErrors.last.kind} $arguments',
-        silent: silent);
+    super.handleRecoverableError(token, message);
+    addCompileTimeError(message.charOffset, message.message, silent: silent);
   }
 
   @override
-  Token handleUnrecoverableError(Token token, ErrorKind kind, Map arguments) {
-    if (isDartLibrary && kind == ErrorKind.ExpectedFunctionBody) {
+  Token handleUnrecoverableError(Token token, FastaMessage message) {
+    if (isDartLibrary && message.code == codeExpectedFunctionBody) {
       Token recover = skipNativeClause(token);
       if (recover != null) return recover;
-    } else if (kind == ErrorKind.UnexpectedToken) {
-      String expected = arguments["expected"];
+    } else if (message.code == codeExpectedButGot) {
+      String expected = message.arguments["string"];
       const List<String> trailing = const <String>[")", "}", ";", ","];
       if (trailing.contains(token.stringValue) && trailing.contains(expected)) {
-        arguments.putIfAbsent("actual", () => token.lexeme);
-        handleRecoverableError(token, ErrorKind.ExpectedButGot, arguments);
+        handleRecoverableError(token, message);
         return newSyntheticToken(token);
       }
     }
-    return super.handleUnrecoverableError(token, kind, arguments);
+    return super.handleUnrecoverableError(token, message);
   }
 
   @override
   Expression buildCompileTimeError(error, [int charOffset = -1]) {
     addCompileTimeError(charOffset, error);
     String message = formatUnexpected(uri, charOffset, error);
     Builder constructor = library.loader.getCompileTimeError();
     return new Throw(buildStaticInvocation(constructor.target,
         new Arguments(<Expression>[new StringLiteral(message)]),
         isConst: false)); // TODO(ahe): Make this const.
@@ skipping 523 matching lines @@
   } else if (node is PrefixBuilder) {
     return node.name;
   } else if (node is ThisAccessor) {
     return node.isSuper ? "super" : "this";
   } else if (node is BuilderAccessor) {
     return node.plainNameForRead;
   } else {
     return internalError("Unhandled: ${node.runtimeType}");
   }
 }