Support captured variables in debugger

runtime/vm/object.cc

 // 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.
 
 #include "vm/object.h"
 
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 6052 matching lines @@
 
 RawString* LocalVarDescriptors::GetName(intptr_t var_index) const {
   ASSERT(var_index < Length());
   const Array& names = Array::Handle(raw_ptr()->names_);
   ASSERT(Length() == names.Length());
   const String& name = String::CheckedHandle(names.At(var_index));
   return name.raw();
 }
 
 
-void LocalVarDescriptors::GetScopeInfo(
-                              intptr_t var_index,
-                              intptr_t* scope_id,
-                              intptr_t* begin_token_pos,
-                              intptr_t* end_token_pos) const {
-  ASSERT(var_index < Length());
-  RawLocalVarDescriptors::VarInfo *info = &raw_ptr()->data_[var_index];
-  *scope_id = info->scope_id;
-  *begin_token_pos = info->begin_pos;
-  *end_token_pos = info->end_pos;
-}
-
-
-intptr_t LocalVarDescriptors::GetSlotIndex(intptr_t var_index) const {
-  ASSERT(var_index < Length());
-  RawLocalVarDescriptors::VarInfo *info = &raw_ptr()->data_[var_index];
-  return info->index;
-}
-
-
 void LocalVarDescriptors::SetVar(intptr_t var_index,
                                  const String& name,
-                                 intptr_t stack_slot,
-                                 intptr_t scope_id,
-                                 intptr_t begin_pos,
-                                 intptr_t end_pos) const {
+                                 RawLocalVarDescriptors::VarInfo* info) const {
   ASSERT(var_index < Length());
   const Array& names = Array::Handle(raw_ptr()->names_);
   ASSERT(Length() == names.Length());
   names.SetAt(var_index, name);
-  RawLocalVarDescriptors::VarInfo *info = &raw_ptr()->data_[var_index];
-  info->index = stack_slot;
-  info->scope_id = scope_id;
-  info->begin_pos = begin_pos;
-  info->end_pos = end_pos;
+  raw_ptr()->data_[var_index] = *info;
+}
+
+
+void LocalVarDescriptors::GetInfo(intptr_t var_index,
+                                  RawLocalVarDescriptors::VarInfo* info) const {
+  ASSERT(var_index < Length());
+  *info = raw_ptr()->data_[var_index];
 }
 
 
 const char* LocalVarDescriptors::ToCString() const {
   UNIMPLEMENTED();
   return "LocalVarDescriptors";
 }
 
 
 RawLocalVarDescriptors* LocalVarDescriptors::New(intptr_t num_variables) {
@@ skipping 4004 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart