Parameterize and move JumpTarget/LabelDefition to elements/jumps.dart

pkg/compiler/lib/src/elements/modelx.dart

 // Copyright (c) 2013, 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 elements.modelx;
 
 import '../common.dart';
 import '../common/names.dart' show Identifiers;
 import '../common/resolution.dart' show Resolution, ParsingContext;
 import '../compiler.dart' show Compiler;
 import '../constants/constant_constructors.dart';
 import '../constants/constructors.dart';
 import '../constants/expressions.dart';
 import '../diagnostics/messages.dart' show MessageTemplate;
 import '../ordered_typeset.dart' show OrderedTypeSet;
 import '../resolution/class_members.dart' show ClassMemberMixin;
 import '../resolution/resolution.dart' show AnalyzableElementX;
 import '../resolution/scope.dart'
     show ClassScope, LibraryScope, Scope, TypeDeclarationScope;
 import '../resolution/tree_elements.dart' show TreeElements;
 import '../resolution/typedefs.dart' show TypedefCyclicVisitor;
 import '../script.dart';
 import 'package:front_end/src/fasta/scanner.dart' show ErrorToken, Token;
 import 'package:front_end/src/fasta/scanner.dart' as Tokens show EOF_TOKEN;
 import '../tree/tree.dart';
 import '../util/util.dart';
 import 'common.dart';
 import 'elements.dart';
 import 'entities.dart';
+import 'jumps.dart';
 import 'names.dart';
 import 'resolution_types.dart';
 import 'visitor.dart' show ElementVisitor;
 
 /// Object that identifies a declaration site.
 ///
 /// For most elements, this is the element itself, but for variable declarations
 /// where multi-declarations like `var a, b, c` are allowed, the declaration
 /// site is a separate object.
 // TODO(johnniwinther): Add [beginToken] and [endToken] getters.
@@ skipping 3229 matching lines @@
   UnnamedMixinApplicationElementX(
       String name, ClassElement subclass, int id, this.node)
       : this.subclass = subclass,
         super(name, subclass.compilationUnit, id);
 
   bool get isUnnamedMixinApplication => true;
 
   bool get isAbstract => true;
 }
 
-class LabelDefinitionX implements LabelDefinition {
+class LabelDefinitionX implements LabelDefinition<Node> {
   final Label label;
   final String labelName;
-  final JumpTarget target;
+  final JumpTarget<Node> target;
   bool isBreakTarget = false;
   bool isContinueTarget = false;
 
   LabelDefinitionX(Label label, String labelName, this.target)
       : this.label = label,
         this.labelName = labelName;
 
   // In case of a synthetic label, just use [labelName] for identifying the
   // label.
   String get name => label == null ? labelName : label.identifier.source;
 
   void setBreakTarget() {
     isBreakTarget = true;
     target.isBreakTarget = true;
   }
 
   void setContinueTarget() {
     isContinueTarget = true;
     target.isContinueTarget = true;
   }
 
   bool get isTarget => isBreakTarget || isContinueTarget;
 
   String toString() => 'Label:${name}';
 }
 
-class JumpTargetX implements JumpTarget {
+class JumpTargetX implements JumpTarget<Node> {
   final ExecutableElement executableContext;
   final Node statement;
   final int nestingLevel;
-  List<LabelDefinition> labels = <LabelDefinition>[];
+  List<LabelDefinition<Node>> labels = <LabelDefinition<Node>>[];
   bool isBreakTarget = false;
   bool isContinueTarget = false;
 
   final int hashCode = ElementX.newHashCode();
 
   JumpTargetX(this.statement, this.nestingLevel, this.executableContext);
 
   @override
   MemberElement get memberContext => executableContext.memberContext;
 
   String get name => "target";
 
   bool get isTarget => isBreakTarget || isContinueTarget;
 
-  LabelDefinition addLabel(Label label, String labelName) {
-    LabelDefinition result = new LabelDefinitionX(label, labelName, this);
+  LabelDefinition<Node> addLabel(Label label, String labelName) {
+    LabelDefinition<Node> result = new LabelDefinitionX(label, labelName, this);
     labels.add(result);
     return result;
   }
 
   bool get isSwitch => statement is SwitchStatement;
 
   String toString() => 'Target:$statement';
 }
 
 class TypeVariableElementX extends ElementX
@@ skipping 174 matching lines @@
       body = node.asFunctionExpression().body;
     }
     return new ParsedResolvedAst(
         declaration,
         node,
         body,
         definingElement.treeElements,
         definingElement.compilationUnit.script.resourceUri);
   }
 }