Use FastaMessage instead of String. Part 1.

pkg/analyzer/lib/src/fasta/ast_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.analyzer.ast_builder;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/dart/ast/ast_factory.dart' show AstFactory;
 import 'package:analyzer/dart/ast/standard_ast_factory.dart' as standard;
 import 'package:analyzer/dart/ast/token.dart' as analyzer show Token;
 import 'package:analyzer/dart/ast/token.dart' show Token, TokenType;
 import 'package:analyzer/dart/element/element.dart' show Element;
 import 'package:front_end/src/fasta/parser/parser.dart'
     show Assert, FormalParameterType, MemberKind, Parser;
 import 'package:front_end/src/fasta/scanner/string_scanner.dart';
 import 'package:front_end/src/fasta/scanner/token.dart' show CommentToken;
 import 'package:front_end/src/scanner/token.dart' as analyzer;
 
 import 'package:front_end/src/fasta/deprecated_problems.dart'
     show deprecated_internalProblem;
-import 'package:front_end/src/fasta/fasta_codes.dart'
-    show
-        FastaCode,
-        FastaMessage,
-        codeExpectedExpression,
-        codeExpectedFunctionBody;
+import 'package:front_end/src/fasta/messages.dart'
+    show Code, Message, codeExpectedExpression, codeExpectedFunctionBody;
 import 'package:front_end/src/fasta/kernel/kernel_builder.dart'
     show Builder, KernelLibraryBuilder, ProcedureBuilder, Scope;
 import 'package:front_end/src/fasta/parser/identifier_context.dart'
     show IdentifierContext;
 import 'package:front_end/src/fasta/quote.dart';
 import 'package:front_end/src/fasta/source/scope_listener.dart'
     show JumpTargetKind, NullValue, ScopeListener;
 import 'analyzer.dart' show toKernel;
 import 'element_store.dart'
     show
@@ skipping 1042 matching lines @@
   void handleInvalidExpression(Token token) {
     debugEvent("InvalidExpression");
   }
 
   @override
   void handleInvalidFunctionBody(Token token) {
     debugEvent("InvalidFunctionBody");
   }
 
   @override
-  Token handleUnrecoverableError(Token token, FastaMessage message) {
+  Token handleUnrecoverableError(Token token, Message message) {
     if (message.code == codeExpectedFunctionBody) {
       if (identical('native', token.stringValue) && parser != null) {
         Token nativeKeyword = token;
         Token semicolon = parser.parseLiteralString(token.next);
         token = parser.expectSemicolon(semicolon);
         StringLiteral name = pop();
         pop(); // star
         pop(); // async
         push(ast.nativeFunctionBody(nativeKeyword, name, semicolon));
         return token;
@@ skipping 808 matching lines @@
   Token _scanGenericMethodComment(String code, int offset) {
     var scanner = new SubStringScanner(offset, code);
     Token firstToken = scanner.tokenize();
     if (scanner.hasErrors) {
       return null;
     }
     return firstToken;
   }
 
   @override
-  void addCompileTimeErrorFromMessage(FastaMessage message) {
-    FastaCode code = message.code;
+  void addCompileTimeError(Message message, int charOffset) {
+    Code code = message.code;
     switch (code.analyzerCode) {
       case "EXPECTED_TYPE_NAME":
         errorReporter?.reportErrorForOffset(
-            ParserErrorCode.EXPECTED_TYPE_NAME, message.charOffset, 1);
+            ParserErrorCode.EXPECTED_TYPE_NAME, charOffset, 1);
         return;
       default:
       // fall through
     }
-    library.deprecated_addCompileTimeError(message.charOffset, message.message,
-        fileUri: message.uri);
+    library.deprecated_addCompileTimeError(charOffset, message.message,
+        fileUri: uri);
   }
 }
 
 /// Data structure placed on the stack to represent a class body.
 ///
 /// This is needed because analyzer has no separate AST representation of a
 /// class body; it simply stores all of the relevant data in the
 /// [ClassDeclaration] object.
 class _ClassBody {
   final Token beginToken;
@@ skipping 88 matching lines @@
       } else if (identical('var', s)) {
         finalConstOrVarKeyword = token;
       } else if (identical('covariant', s)) {
         covariantKeyword = token;
       } else {
         deprecated_internalProblem('Unhandled modifier: $s');
       }
     }
   }
 }