Refactoring to prepare for kernel based jump targets

pkg/compiler/lib/src/resolution/members.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.
 
 library dart2js.resolution.members;
 
 import 'package:front_end/src/fasta/scanner.dart' show isUserDefinableOperator;
 
 import '../common.dart';
 import '../common/names.dart' show Selectors;
 import '../common/resolution.dart' show Resolution;
 import '../compile_time_constants.dart';
 import '../constants/constructors.dart'
     show RedirectingFactoryConstantConstructor;
 import '../constants/expressions.dart';
 import '../constants/values.dart';
 import '../common_elements.dart';
 import '../elements/elements.dart';
 import '../elements/entities.dart' show AsyncMarker;
 import '../elements/modelx.dart'
     show
         ConstructorElementX,
         ErroneousElementX,
         FunctionElementX,
         JumpTargetX,
+        LabelDefinitionX,
         LocalFunctionElementX,
         LocalParameterElementX,
         ParameterElementX,
         VariableElementX,
         VariableList;
 import '../elements/jumps.dart';
 import '../elements/names.dart';
 import '../elements/operators.dart';
 import '../elements/resolution_types.dart';
 import '../options.dart';
@@ skipping 4210 matching lines @@
 
     if (isValidAsConstant) {
       ConstantExpression constant = new ConcatenateConstantExpression(parts);
       registry.setConstant(node, constant);
       return new ConstantResult(node, constant);
     }
     return const NoneResult();
   }
 
   ResolutionResult visitBreakStatement(BreakStatement node) {
-    JumpTarget target;
+    JumpTargetX target;
     if (node.target == null) {
       target = statementScope.currentBreakTarget();
       if (target == null) {
         reporter.reportErrorMessage(node, MessageKind.NO_BREAK_TARGET);
         return const NoneResult();
       }
       target.isBreakTarget = true;
     } else {
       String labelName = node.target.source;
-      LabelDefinition label = statementScope.lookupLabel(labelName);
+      LabelDefinitionX label = statementScope.lookupLabel(labelName);
       if (label == null) {
         reporter.reportErrorMessage(
             node.target, MessageKind.UNBOUND_LABEL, {'labelName': labelName});
         return const NoneResult();
       }
       target = label.target;
       if (!target.statement.isValidBreakTarget()) {
         reporter.reportErrorMessage(node.target, MessageKind.INVALID_BREAK);
         return const NoneResult();
       }
       label.setBreakTarget();
       registry.useLabel(node, label);
     }
     registry.registerTargetOf(node, target);
     return const NoneResult();
   }
 
   ResolutionResult visitContinueStatement(ContinueStatement node) {
-    JumpTarget target;
+    JumpTargetX target;
     if (node.target == null) {
       target = statementScope.currentContinueTarget();
       if (target == null) {
         reporter.reportErrorMessage(node, MessageKind.NO_CONTINUE_TARGET);
         return const NoneResult();
       }
       target.isContinueTarget = true;
     } else {
       String labelName = node.target.source;
-      LabelDefinition label = statementScope.lookupLabel(labelName);
+      LabelDefinitionX label = statementScope.lookupLabel(labelName);
       if (label == null) {
         reporter.reportErrorMessage(
             node.target, MessageKind.UNBOUND_LABEL, {'labelName': labelName});
         return const NoneResult();
       }
       target = label.target;
       if (!target.statement.isValidContinueTarget()) {
         reporter.reportErrorMessage(node.target, MessageKind.INVALID_CONTINUE);
       }
       label.setContinueTarget();
@@ skipping 511 matching lines @@
     }
     return const NoneResult();
   }
 }
 
 /// Looks up [name] in [scope] and unwraps the result.
 Element lookupInScope(
     DiagnosticReporter reporter, Node node, Scope scope, String name) {
   return Elements.unwrap(scope.lookup(name), reporter, node);
 }