Remove deprecated API from scope.

[email protected]

Review-Url: https://codereview.chromium.org/2975163002 .

Author: peter-ahe-google

pkg/front_end/lib/src/fasta/fasta_codes_generated.dart

@@ -39,6 +39,25 @@ const MessageCode messageAbstractNotSync = const MessageCode("AbstractNotSync",
     dart2jsCode: "*ignored*",
     message: r"""Abstract methods can't use 'async', 'async*', or 'sync*'.""");
 
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<Message Function(String name)> templateAccessError =
+    const Template<Message Function(String name)>(
+        messageTemplate: r"""Access error: '#name'.""",
+        withArguments: _withArgumentsAccessError);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codeAccessError =
+    const Code<Message Function(String name)>(
+  "AccessError",
+  templateAccessError,
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsAccessError(String name) {
+  return new Message(codeAccessError,
+      message: """Access error: '$name'.""", arguments: {'name': name});
+}
+
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Template<
     Message Function(
@@ -2209,6 +2228,25 @@ const MessageCode messagePositionalParameterWithEquals = const MessageCode(
         r"""Positional optional parameters can't use ':' to specify a default value.""",
     tip: r"""Try replacing ':' with '='.""");
 
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Template<Message Function(String name)> templatePreviousUseOfName =
+    const Template<Message Function(String name)>(
+        messageTemplate: r"""Previous use of '#name'.""",
+        withArguments: _withArgumentsPreviousUseOfName);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Message Function(String name)> codePreviousUseOfName =
+    const Code<Message Function(String name)>(
+  "PreviousUseOfName",
+  templatePreviousUseOfName,
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+Message _withArgumentsPreviousUseOfName(String name) {
+  return new Message(codePreviousUseOfName,
+      message: """Previous use of '$name'.""", arguments: {'name': name});
+}
+
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Code<Null> codePrivateNamedParameter = messagePrivateNamedParameter;
 

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

@@ -17,12 +17,11 @@ import 'package:kernel/transformations/flags.dart' show TransformerFlag;
 
 import '../../scanner/token.dart' show BeginToken, Token;
 
-import '../deprecated_problems.dart'
-    show deprecated_InputError, deprecated_formatUnexpected;
+import '../deprecated_problems.dart' show deprecated_formatUnexpected;
 
 import '../fasta_codes.dart' as fasta;
 
-import '../fasta_codes.dart' show Message;
+import '../fasta_codes.dart' show LocatedMessage, Message;
 
 import '../messages.dart' as messages show getLocationFromUri;
 
@@ -326,7 +325,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
           "'$name' already declared in this scope.", offset));
       return;
     }
-    deprecated_InputError error = scope.declare(
+    LocatedMessage error = scope.declare(
         variable.name,
         new KernelVariableBuilder(
             variable, member ?? classBuilder ?? library, uri),
@@ -346,9 +345,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
 
       // Reports the error on `print(x)`.
       library.addCompileTimeError(
-          fasta.templateUnspecified.withArguments(error.error),
-          error.charOffset,
-          error.uri);
+          error.messageObject, error.charOffset, error.uri);
     }
   }
 
@@ -1649,7 +1646,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
     }
     if (builder.hasProblem) {
       ProblemBuilder problem = builder;
-      deprecated_addCompileTimeError(charOffset, problem.deprecated_message);
+      addCompileTimeError(problem.message, charOffset);
     } else {
       warningNotError(
           fasta.templateNotAType.withArguments(builder.fullNameForErrors),
@@ -3236,8 +3233,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
 
   @override
   Expression buildProblemExpression(ProblemBuilder builder, int charOffset) {
-    return deprecated_buildCompileTimeError(
-        builder.deprecated_message, charOffset);
+    return buildCompileTimeError(builder.message, charOffset);
   }
 
   @override

pkg/front_end/lib/src/fasta/scope.dart

@@ -6,12 +6,17 @@ library fasta.scope;
 
 import 'builder/builder.dart' show Builder, TypeVariableBuilder;
 
-import 'deprecated_problems.dart' show deprecated_InputError;
+import 'fasta_codes.dart'
+    show
+        LocatedMessage,
+        Message,
+        messageInternalProblemExtendingUnmodifiableScope,
+        templateAccessError,
+        templateDuplicatedName,
+        templatePreviousUseOfName;
 
 import 'problems.dart' show internalProblem, unsupported;
 
-import 'fasta_codes.dart' show messageInternalProblemExtendingUnmodifiableScope;
-
 class MutableScope {
   /// Names declared in this scope.
   Map<String, Builder> local;
@@ -188,12 +193,13 @@ class Scope extends MutableScope {
   /// If name was used previously in this scope, this method returns an error
   /// that should be reported as a compile-time error. The position of this
   /// error is given by [charOffset] and [fileUri].
-  deprecated_InputError declare(
+  LocatedMessage declare(
       String name, Builder builder, int charOffset, Uri fileUri) {
     if (isModifiable) {
       if (usedNames?.containsKey(name) ?? false) {
-        return new deprecated_InputError(
-            fileUri, usedNames[name], "Previous use of '$name'.");
+        return templatePreviousUseOfName
+            .withArguments(name)
+            .withLocation(fileUri, usedNames[name]);
       }
       recordUse(name, charOffset, fileUri);
       local[name] = builder;
@@ -279,7 +285,7 @@ abstract class ProblemBuilder extends Builder {
 
   bool get hasProblem => true;
 
-  String get deprecated_message;
+  Message get message;
 
   @override
   String get fullNameForErrors => name;
@@ -313,12 +319,12 @@ class AccessErrorBuilder extends ProblemBuilder {
 
   bool get isLocal => builder.isLocal;
 
-  String get deprecated_message => "Access error: '$name'.";
+  Message get message => templateAccessError.withArguments(name);
 }
 
 class AmbiguousBuilder extends ProblemBuilder {
   AmbiguousBuilder(String name, Builder builder, int charOffset, Uri fileUri)
       : super(name, builder, charOffset, fileUri);
 
-  String get deprecated_message => "Duplicated named: '$name'.";
+  Message get message => templateDuplicatedName.withArguments(name);
 }

pkg/front_end/messages.yaml

@@ -840,3 +840,9 @@ ConstConstructorNonFinalField:
 
 ConstConstructorNonFinalFieldCause:
   template: "Field isn't final, but constructor is 'const'."
+
+AccessError:
+  template: "Access error: '#name'."
+
+PreviousUseOfName:
+  template: "Previous use of '#name'."