More cleanups in debugger API and wire protocol

runtime/include/dart_debugger_api.h

 // Copyright (c) 2011, 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 INCLUDE_DART_DEBUGGER_API_H_
 #define INCLUDE_DART_DEBUGGER_API_H_
 
 #include "include/dart_api.h"
 
 typedef struct _Dart_Breakpoint* Dart_Breakpoint;
@@ skipping 26 matching lines @@
 typedef void Dart_ExceptionThrownHandler(Dart_IsolateId isolate_id,
                                          Dart_Handle exception_object,
                                          Dart_StackTrace stack_trace);
 
 typedef enum {
   kCreated = 0,
   kInterrupted,
   kShutdown,
 } Dart_IsolateEvent;
 
+
+/**
+ * Represents a location in Dart code.
+ */
+typedef struct {
+  Dart_Handle script_url;  // Url (string) of the script.
+  int32_t library_id;      // Library in which the script is loaded.
+  int32_t token_pos;    // Code address.

[Tom Ball, 2013/04/12 21:44:32]

Line up comment?

[hausner, 2013/04/12 21:48:09]

Done.

+} Dart_CodeLocation;
+
+
 typedef void Dart_IsolateEventHandler(Dart_IsolateId isolate_id,
                                       Dart_IsolateEvent kind);
 
 /**
  * Caches a given \object and returns an object id. The object id is only
  * valid while the VM is paused. The cache is invalidated when the VM
  * resumes.
  *
  * Requires there to be a current isolate.
  *
@@ skipping 298 matching lines @@
  *
  * \return A handle to the True object if no error occurs.
  */
 DART_EXPORT Dart_Handle Dart_GetActivationFrame(
                             Dart_StackTrace trace,
                             int frame_index,
                             Dart_ActivationFrame* frame);
 
 
 /**
+ * DEPRECATED -- Use Dart_ActivationframeGetLocation instead.
+ *
  * Returns information about the given activation frame.
  * \function_name receives a string handle with the qualified
  *    function name.
  * \script_url receives a string handle with the url of the
  *    source script that contains the frame's function.
  * \line_number receives the line number in the script.
  * \library_id receives the id of the library in which the
  *    function in this frame is defined.
  *
  * Any or all of the out parameters above may be NULL.
  *
  * Requires there to be a current isolate.
  *
  * \return A handle to the True object if no error occurs.
  */
 DART_EXPORT Dart_Handle Dart_ActivationFrameInfo(
                             Dart_ActivationFrame activation_frame,
                             Dart_Handle* function_name,
                             Dart_Handle* script_url,
                             intptr_t* line_number,
                             intptr_t* library_id);
 
 
 /**
- * Returns text location of the given activation frame.
- * \script_url receives a string handle with the url of the
- *    source script that contains the frame's function.
+ * Returns code location of the given activation frame.
+ *
+ * \function_name receives a string handle with the qualified
+ *    function name.
+ * \locatin.script_url receives a string handle with the url of

[Tom Ball, 2013/04/12 21:44:32]

locatin => location

[hausner, 2013/04/12 21:48:09]

Done.

+ *    the source script that contains the frame's function.
  *    Receives a null handle if there is no textual location
  *    that corresponds to the frame, e.g. for implicitly
  *    generated constructors.
- * \token_number receives the line number in the script.
+ * \location.library_id receives the id of the library in which the
+ *    function in this frame is defined.
+ * \location.token_pos receives the token position in the script.
  *
- * Any or all of the out parameters above may be NULL.
+ * Any of the out parameters above may be NULL.
  *
  * Requires there to be a current isolate.
  *
  * \return A handle to the True object if no error occurs.
  *         A handle to the False object if there is no text
  *         position for the frame.
  */
 DART_EXPORT Dart_Handle Dart_ActivationFrameGetLocation(
                             Dart_ActivationFrame activation_frame,
-                            Dart_Handle* script_url,
-                            intptr_t* library_id,
-                            intptr_t* token_number);
+                            Dart_Handle* function_name,
+                            Dart_CodeLocation* location);
 
 
 /**
  * Returns an array containing all the local variable names and values of
  * the given \activation_frame.
  *
  * Requires there to be a current isolate.
  *
  * \return A handle to an array containing variable names and
  * corresponding values. The array is empty if the activation frame has
@@ skipping 169 matching lines @@
  * \param request A REST-like string, which uses '/' to separate
  *     parameters. The first parameter is always the status type.
  *
  * \return The requested status as a JSON formatted string, with the
  *     contents defined by the status plug-in. The caller is responsible
  *     for freeing this string.
  */
 DART_EXPORT char* Dart_GetVmStatus(const char* request);
 
 #endif  // INCLUDE_DART_DEBUGGER_API_H_