Support breakpoints in closures

runtime/vm/debugger.h

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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_DEBUGGER_H_
 #define VM_DEBUGGER_H_
 
 #include "vm/object.h"
 
 namespace dart {
 
@@ skipping 141 matching lines @@
 
   LocalVarDescriptors* var_descriptors_;
   ZoneGrowableArray<intptr_t> desc_indices_;
 
   friend class Debugger;
   DISALLOW_COPY_AND_ASSIGN(ActivationFrame);
 };
 
 
 // Array of function activations on the call stack.
-class StackTrace : public ZoneAllocated {
+class DebuggerStackTrace : public ZoneAllocated {
  public:
-  explicit StackTrace(int capacity) : trace_(capacity) { }
+  explicit DebuggerStackTrace(int capacity) : trace_(capacity) { }
 
   intptr_t Length() const { return trace_.length(); }
 
   ActivationFrame* ActivationFrameAt(int i) const {
     ASSERT(i < trace_.length());
     return trace_[i];
   }
  private:
   void AddActivation(ActivationFrame* frame);
   ZoneGrowableArray<ActivationFrame*> trace_;
 
   friend class Debugger;
-  DISALLOW_COPY_AND_ASSIGN(StackTrace);
+  DISALLOW_COPY_AND_ASSIGN(DebuggerStackTrace);
 };
 
 
-typedef void BreakpointHandler(SourceBreakpoint* bpt, StackTrace* stack);
+typedef void BreakpointHandler(SourceBreakpoint* bpt,
+                               DebuggerStackTrace* stack);
 
 
 class Debugger {
  public:
   Debugger();
   ~Debugger();
 
   void Initialize(Isolate* isolate);
   void Shutdown();
   bool IsActive();
@@ skipping 44 matching lines @@
 
   void InstrumentForStepping(const Function &target_function);
   SourceBreakpoint* SetBreakpoint(const Function& target_function,
                                   intptr_t token_index);
   void RemoveInternalBreakpoints();
   void RemoveCodeBreakpoints(SourceBreakpoint* src_bpt);
   void RegisterSourceBreakpoint(SourceBreakpoint* bpt);
   void RegisterCodeBreakpoint(CodeBreakpoint* bpt);
   SourceBreakpoint* GetSourceBreakpoint(const Function& func,
                                         intptr_t token_index);
-  CodeBreakpoint* MakeCodeBreakpoint(SourceBreakpoint* src_bpt);
+  CodeBreakpoint* MakeCodeBreakpoint(const Function& func,
+                                     intptr_t token_index);
 
   // Returns NULL if no breakpoint exists for the given address.
   CodeBreakpoint* GetCodeBreakpoint(uword breakpoint_address);
 
   void SyncBreakpoint(SourceBreakpoint* bpt);
 
   Isolate* isolate_;
   bool initialized_;
   BreakpointHandler* bp_handler_;
   SourceBreakpoint* src_breakpoints_;
   CodeBreakpoint* code_breakpoints_;
 
   // Tells debugger what to do when resuming execution after a breakpoint.
   ResumeAction resume_action_;
 
   friend class SourceBreakpoint;
   DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DEBUGGER_H_