Debugger support to display global variables

runtime/vm/debugger_api_impl.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 "include/dart_debugger_api.h"
 
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/debugger.h"
 #include "vm/isolate.h"
@@ skipping 155 matching lines @@
   CHECK_NOT_NULL(trace);
   *trace = reinterpret_cast<Dart_StackTrace>(isolate->debugger()->StackTrace());
   return Api::True(isolate);
 }
 
 
 DART_EXPORT Dart_Handle Dart_ActivationFrameInfo(
                             Dart_ActivationFrame activation_frame,
                             Dart_Handle* function_name,
                             Dart_Handle* script_url,
-                            intptr_t* line_number) {
+                            intptr_t* line_number,
+                            intptr_t* library_id) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_AND_CAST(ActivationFrame, frame, activation_frame);
   if (function_name != NULL) {
     *function_name = Api::NewHandle(isolate, frame->QualifiedFunctionName());
   }
   if (script_url != NULL) {
     *script_url = Api::NewHandle(isolate, frame->SourceUrl());
   }
   if (line_number != NULL) {
     *line_number = frame->LineNumber();
   }
+  if (library_id != NULL) {
+    const Library& lib = Library::Handle(frame->Library());
+    *library_id = lib.index();
+  }
   return Api::True(isolate);
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetLocalVariables(
                             Dart_ActivationFrame activation_frame) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   CHECK_AND_CAST(ActivationFrame, frame, activation_frame);
   return Api::NewHandle(isolate, frame->GetLocalVariables());
@@ skipping 210 matching lines @@
   const Library& lib =
       Library::Handle(isolate, Library::GetLibrary(library_id));
   if (lib.IsNull()) {
     return Api::NewError("%s: %d is not a valid library id",
                          CURRENT_FUNC, library_id);
   }
   return Api::NewHandle(isolate, isolate->debugger()->GetLibraryFields(lib));
 }
 
 
+DART_EXPORT Dart_Handle Dart_GetGlobalVariables(intptr_t library_id) {
+  Isolate* isolate = Isolate::Current();
+  ASSERT(isolate != NULL);
+  DARTSCOPE(isolate);
+  const Library& lib = Library::Handle(Library::GetLibrary(library_id));
+  if (lib.IsNull()) {
+    return Api::NewError("%s: %d is not a valid library id",
+                         CURRENT_FUNC, library_id);
+  }
+  return Api::NewHandle(isolate, isolate->debugger()->GetGlobalFields(lib));
+}
+
+
 DART_EXPORT Dart_Handle Dart_GetObjClass(Dart_Handle object_in) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   Instance& obj = Instance::Handle();
   UNWRAP_AND_CHECK_PARAM(Instance, obj, object_in);
   return Api::NewHandle(isolate, obj.clazz());
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetObjClassId(Dart_Handle object_in,
@@ skipping 151 matching lines @@
 
 DART_EXPORT Dart_Handle Dart_GetLibraryImports(intptr_t library_id) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   DARTSCOPE(isolate);
   const Library& lib = Library::Handle(Library::GetLibrary(library_id));
   if (lib.IsNull()) {
     return Api::NewError("%s: %d is not a valid library id",
                          CURRENT_FUNC, library_id);
   }
-  String& prefix_name = String::Handle();
-  LibraryPrefix& prefix = LibraryPrefix::Handle();
-  Library& imported = Library::Handle();
+  const GrowableObjectArray& import_list =
+      GrowableObjectArray::Handle(GrowableObjectArray::New(8));
+
+  String& prefix_name = String::Handle(isolate);
+  Library& imported = Library::Handle(isolate);
   intptr_t num_imports = lib.num_imports();
-  const Array& import_list = Array::Handle(Array::New(2 * num_imports));
   for (int i = 0; i < num_imports; i++) {
-    prefix_name = String::null();
-    prefix = lib.ImportPrefixAt(i);
-    if (!prefix.IsNull()) {
-      prefix_name = prefix.name();
-    }
-    import_list.SetAt(2 * i, prefix_name);
+    import_list.Add(prefix_name);  // Null prefix name means no prefix.
     imported = lib.ImportAt(i);
     ASSERT(!imported.IsNull());
     ASSERT(Smi::IsValid(imported.index()));
-    import_list.SetAt(2 * i + 1, Smi::Handle(Smi::New(imported.index())));
+    import_list.Add(Smi::Handle(Smi::New(imported.index())));
   }
-  return Api::NewHandle(isolate, import_list.raw());
+  LibraryPrefixIterator it(lib);
+  LibraryPrefix& prefix = LibraryPrefix::Handle(isolate);
+  while (it.HasNext()) {
+    prefix = it.GetNext();
+    prefix_name = prefix.name();
+    ASSERT(!prefix_name.IsNull());
+    prefix_name = String::Concat(prefix_name,
+                                 String::Handle(isolate, String::New(".")));
+    for (int i = 0; i < prefix.num_libs(); i++) {
+      imported = prefix.GetLibrary(i);
+      import_list.Add(prefix_name);
+      import_list.Add(Smi::Handle(Smi::New(imported.index())));
+    }
+  }
+  return Api::NewHandle(isolate, Array::MakeArray(import_list));
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetLibraryURL(intptr_t library_id) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   DARTSCOPE(isolate);
   const Library& lib = Library::Handle(Library::GetLibrary(library_id));
   if (lib.IsNull()) {
     return Api::NewError("%s: %d is not a valid library id",
@@ skipping 19 matching lines @@
   for (int i = 0; i < num_libs; i++) {
     lib ^= libs.At(i);
     ASSERT(!lib.IsNull());
     lib_url = lib.url();
     library_url_list.SetAt(i, lib_url);
   }
   return Api::NewHandle(isolate, library_url_list.raw());
 }
 
 }  // namespace dart