Prepare for development branch by updating externally-used API.

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, MemberKind, optional;
@@ skipping 31 matching lines @@
 
 import 'package:kernel/core_types.dart' show CoreTypes;
 
 import 'frontend_accessors.dart' show buildIsNull, makeBinary, makeLet;
 
 import '../../scanner/token.dart' show Token;
 
 import '../scanner/token.dart'
     show BeginGroupToken, isBinaryOperator, isMinusOperator;
 
-import '../errors.dart' show formatUnexpected, internalError;
+import '../errors.dart' show InputError, formatUnexpected, internalError;
 
 import '../source/scope_listener.dart'
     show JumpTargetKind, NullValue, ScopeListener;
 
 import '../scope.dart' show ProblemBuilder;
 
 import 'fasta_accessors.dart';
 
 import '../quote.dart'
     show
@@ skipping 235 matching lines @@
         if (outerSwitchScope == null) {
           addCompileTimeError(-1, "Label not found: '$name'.");
         } else {
           outerSwitchScope.forwardDeclareLabel(name, builder);
         }
       });
     }
     switchScope = outerSwitchScope;
   }
 
+  void declareVariable(VariableDeclaration variable) {
+    InputError error = scope.declare(
+        variable.name,
+        new KernelVariableBuilder(
+            variable, member ?? classBuilder ?? library, uri),
+        variable.fileOffset,
+        uri);
+    if (error != null) {
+      addCompileTimeError(
+          variable.fileOffset,
+          "Can't declare '${variable.name}' because it was already used in "
+          "this scope.");
+      library.addCompileTimeError(error.charOffset, error.error,
+          fileUri: error.uri);
+    }
+  }
+
   @override
   JumpTarget createJumpTarget(JumpTargetKind kind, int charOffset) {
     return new JumpTarget(kind, functionNestingLevel, member, charOffset);
   }
 
   @override
   void endMetadata(Token beginToken, Token periodBeforeName, Token endToken) {
     debugEvent("Metadata");
     pop(); // Arguments.
     popIfNotNull(periodBeforeName); // Postfix.
@@ skipping 818 matching lines @@
     }
   }
 
   @override
   void endInitializedIdentifier(Token nameToken) {
     // TODO(ahe): Use [InitializedIdentifier] here?
     debugEvent("InitializedIdentifier");
     VariableDeclaration variable = pop();
     variable.fileOffset = nameToken.charOffset;
     push(variable);
-    scope[variable.name] = new KernelVariableBuilder(
-        variable, member ?? classBuilder ?? library, uri);
+    declareVariable(variable);
   }
 
   @override
   void beginVariablesDeclaration(Token token) {
     debugEvent("beginVariablesDeclaration");
     DartType type = pop();
     int modifiers = Modifier.validate(pop());
     super.push(currentLocalVariableModifiers);
     super.push(currentLocalVariableType ?? NullValue.Type);
     currentLocalVariableType = type;
@@ skipping 897 matching lines @@
   @override
   void endFunctionName(Token beginToken, Token token) {
     debugEvent("FunctionName");
     Identifier name = pop();
     VariableDeclaration variable = astFactory.variableDeclaration(
         name.name, name.token, functionNestingLevel,
         isFinal: true, isLocalFunction: true);
     push(new KernelFunctionDeclaration(
         variable, new FunctionNode(new InvalidStatement()))
       ..fileOffset = beginToken.charOffset);
-    scope[variable.name] = new KernelVariableBuilder(
-        variable, member ?? classBuilder ?? library, uri);
+    declareVariable(variable);
     enterLocalScope();
   }
 
   void enterFunction() {
     debugEvent("enterFunction");
     functionNestingLevel++;
     push(switchScope ?? NullValue.SwitchScope);
     switchScope = null;
     push(inCatchBlock);
     inCatchBlock = false;
@@ skipping 584 matching lines @@
     }
     for (Expression argument in expressions.reversed) {
       expression = new Let(
           new VariableDeclaration.forValue(argument, isFinal: true),
           expression);
     }
     return expression;
   }
 
   @override
+  void addCompileTimeErrorFromMessage(FastaMessage message) {
+    library.addCompileTimeError(message.charOffset, message.message,
+        fileUri: message.uri);
+  }
+
+  @override
   void debugEvent(String name) {
     // printEvent(name);
   }
 
   @override
   StaticGet makeStaticGet(Member readTarget, Token token) {
     // TODO(paulberry): only record the dependencies mandated by the top level
     // type inference spec.
     if (fieldDependencies != null && readTarget is KernelField) {
       var fieldNode = _typeInferrer.getFieldNodeForReadTarget(readTarget);
@@ skipping 486 matching lines @@
     if (starToken == null) {
       return AsyncMarker.Async;
     } else {
       assert(identical(starToken.stringValue, "*"));
       return AsyncMarker.AsyncStar;
     }
   } else {
     return internalError("Unknown async modifier: $asyncToken");
   }
 }