Introduce a nesting stack to the flow graph builder.

runtime/vm/scopes.h

 // 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.
 
 #ifndef VM_SCOPES_H_
 #define VM_SCOPES_H_
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 #include "vm/symbols.h"
 #include "vm/token.h"
 
 namespace dart {
 
-class JoinEntryInstr;
 class LocalScope;
 
 
 class LocalVariable : public ZoneAllocated {
  public:
   LocalVariable(intptr_t token_pos,
                 const String& name,
                 const AbstractType& type)
     : token_pos_(token_pos),
       name_(name),
@@ skipping 114 matching lines @@
     kTry,
     kCatch,
     kForward,
     kStatement  // Any statement other than the above
   };
 
   SourceLabel(intptr_t token_pos, const String& name, Kind kind)
     : token_pos_(token_pos),
       name_(name),
       owner_(NULL),
-      kind_(kind),
-      join_for_break_(NULL),
-      join_for_continue_(NULL),
-      is_continue_target_(false) {
+      kind_(kind) {
   }
 
   static SourceLabel* New(intptr_t token_pos, String* name, Kind kind) {
     if (name != NULL) {
       return new SourceLabel(token_pos, *name, kind);
     } else {
       return new SourceLabel(token_pos,
                              Symbols::DefaultLabel(),
                              kind);
     }
   }
 
   intptr_t token_pos() const { return token_pos_; }
   const String& name() const { return name_; }
   LocalScope* owner() const { return owner_; }
   void set_owner(LocalScope* owner) {
     ASSERT(owner_ == NULL);
     owner_ = owner;
   }
 
   Kind kind() const { return kind_; }
 
-  void set_join_for_continue(JoinEntryInstr* join) {
-    ASSERT(join_for_continue_ == NULL);
-    join_for_continue_ = join;
-  }
-
-  JoinEntryInstr* join_for_continue() const {
-    return join_for_continue_;
-  }
-
-  bool is_continue_target() const { return is_continue_target_; }
-  void set_is_continue_target(bool value) { is_continue_target_ = value; }
-
-  void set_join_for_break(JoinEntryInstr* join) {
-    ASSERT(join_for_break_ == NULL);
-    join_for_break_ = join;
-  }
-
-  JoinEntryInstr* join_for_break() const {
-    return join_for_break_;
-  }
-
   // Returns the function level of the scope in which the label is defined.
   int FunctionLevel() const;
 
   void ResolveForwardReference() { kind_ = kCase; }
 
  private:
-  // TODO(zerny): Remove this hack when the builder no longer stores state in
-  // the ast/scopes.
-  friend class SourceLabelResetter;
-
   const intptr_t token_pos_;
   const String& name_;
   LocalScope* owner_;  // Local scope declaring this label.
 
   Kind kind_;
-  JoinEntryInstr* join_for_break_;
-  JoinEntryInstr* join_for_continue_;
-  bool is_continue_target_;  // Needed for CaseNode.
 
   DISALLOW_COPY_AND_ASSIGN(SourceLabel);
 };
 
 
 class LocalScope : public ZoneAllocated {
  public:
   LocalScope(LocalScope* parent, int function_level, int loop_level);
 
   LocalScope* parent() const { return parent_; }
@@ skipping 156 matching lines @@
   // List of names referenced in this scope and its children that
   // are not resolved to local variables.
   GrowableArray<NameReference*> referenced_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCOPES_H_