Use FastaMessage instead of String. Part 1.

pkg/front_end/lib/src/fasta/builder/library_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.library_builder;
 
 import '../combinator.dart' show Combinator;
 
 import '../deprecated_problems.dart' show deprecated_internalProblem;
 
 import '../export.dart' show Export;
 
 import '../loader.dart' show Loader;
 
-import '../messages.dart' show deprecated_nit, deprecated_warning;
+import '../messages.dart'
+    show BoundFastaMessage, deprecated_nit, deprecated_warning, nit, warning;
 
 import '../util/relativize.dart' show relativizeUri;
 
 import 'builder.dart'
     show
         Builder,
         ClassBuilder,
         DynamicTypeBuilder,
         PrefixBuilder,
         Scope,
@@ skipping 44 matching lines @@
   ///
   /// If [fileUri] is null, it defaults to `this.fileUri`.
   void deprecated_addCompileTimeError(int charOffset, Object message,
       {Uri fileUri, bool silent: false, bool wasHandled: false}) {
     hasCompileTimeErrors = true;
     loader.deprecated_addCompileTimeError(
         fileUri ?? this.fileUri, charOffset, message,
         silent: silent, wasHandled: wasHandled);
   }
 
+  void addCompileTimeError(BoundFastaMessage bind, int charOffset, Uri uri,

[Siggi Cherem (dart-lang), 2017/07/07 21:17:08]

I feel we are are overloading the term `bind`:

  * bind in UnboundFastaCode converts unbound-code to produce a bound-message
  * bind here converts a bound-message to a message with location

A small fix would be to use a different variable name here, like "message", but
I think it is a confusing name to use as a function target.

I believe it makes sense to do some broader renames of the types. One option is
to rename "BoundFastaMessage" to something that is more like a verb like
"FastaMessageCreator" and use a variable name that implies the action (e.g.
"generateMessage"). But I feel things will get cleaner if we represent
`BoundFastaMessage` as an object and not a function.  I made a more detailed
suggestion in fasta_codes.dart, take a look there.

[ahe, 2017/07/10 13:43:50]

I agree.

+      {bool silent: false, bool wasHandled: false}) {
+    deprecated_addCompileTimeError(
+        charOffset, bind(fileUri, charOffset).message,
+        fileUri: uri, silent: silent, wasHandled: wasHandled);
+  }
+
+  void addWarning(BoundFastaMessage bind, int charOffset, Uri uri,
+      {bool silent: false}) {
+    if (!silent) {
+      warning(bind(uri, charOffset));
+    }
+  }
+
+  void addNit(BoundFastaMessage bind, int charOffset, Uri uri,
+      {bool silent: false}) {
+    if (!silent) {
+      nit(bind(uri, charOffset));
+    }
+  }
+
   void deprecated_addWarning(int charOffset, Object message,
       {Uri fileUri, bool silent: false}) {
     fileUri ??= this.fileUri;
     if (!silent) {
       deprecated_warning(fileUri, charOffset, message);
     }
   }
 
   void deprecated_addNit(int charOffset, Object message,
       {Uri fileUri, bool silent: false}) {
@@ skipping 89 matching lines @@
   /// (and not a setter).
   Builder operator [](String name) {
     return scope.local[name] ??
         deprecated_internalProblem("Not found: '$name'.");
   }
 
   Builder lookup(String name, int charOffset, Uri fileUri) {
     return scope.lookup(name, charOffset, fileUri);
   }
 }