Import scope rules updated.

lib/compiler/implementation/ssa/builder.dart

 // Copyright (c) 2012, 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.
 
 class Interceptors {
   Compiler compiler;
   Interceptors(Compiler this.compiler);
 
   SourceString mapOperatorToMethodName(Operator op) {
     String name = op.source.stringValue;
@@ skipping 2840 matching lines @@
     }
     HInstruction arguments = new HLiteralList(argumentValues);
     add(arguments);
     pushInvokeHelper3(helper, receiver, name, arguments);
   }
 
   visitNewExpression(NewExpression node) {
     Element element = elements[node.send];
     if (Elements.isErroneousElement(element)) {
       ErroneousElement error = element;
-      Message message = error.errorMessage;
-      if (message.kind == MessageKind.CANNOT_FIND_CONSTRUCTOR) {
+      if (error.messageKind == MessageKind.CANNOT_FIND_CONSTRUCTOR) {
         generateThrowNoSuchMethod(node.send,
                                   getTargetName(error, 'constructor'),
                                   node.send.arguments);
-      } else if (message.kind == MessageKind.CANNOT_RESOLVE) {
-        generateRuntimeError(node.send, message.message);
+      } else if (error.messageKind == MessageKind.CANNOT_RESOLVE) {
+        Message message = error.messageKind.message(error.messageArguments);
+        generateRuntimeError(node.send, message.toString());
       } else {
         compiler.internalError('unexpected unresolved constructor call',
                                node: node);
       }
     } else if (node.isConst()) {
       // TODO(karlklose): add type representation
       ConstantHandler handler = compiler.constantHandler;
       Constant constant = handler.compileNodeWithDefinitions(node, elements);
       stack.add(graph.addConstant(constant));
     } else {
@@ skipping 1354 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }