Report function source position via JSON protocol

src/mirror-delay.js

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 831 matching lines @@
   if (this.resolved()) {
     var script = %FunctionGetScript(this.value_);
     if (script) {
       return MakeMirror(script);
     }
   }
 };
 
 
 /**
+ * Returns the script source position for the function. Only makes sense
+ * for functions which has a script defined.
+ * @return {Number or undefined} in-script position for the function
+ */
+FunctionMirror.prototype.sourcePosition_ = function() {
+  // Return script if function is resolved. Otherwise just fall through
+  // to return undefined.
+  if (this.resolved()) {
+    return %FunctionGetScriptSourcePosition(this.value_);
+  }
+};
+
+
+/**
+ * Returns the script source location object for the function. Only makes sense
+ * for functions which has a script defined.
+ * @return {Location or undefined} in-script location for the function begin
+ */
+FunctionMirror.prototype.sourceLocation = function() {
+  if (this.resolved() && this.script()) {
+    return this.script().locationFromPosition(this.sourcePosition_(),
+                                              true);
+  }
+};
+
+
+/**
  * Returns objects constructed by this function.
  * @param {number} opt_max_instances Optional parameter specifying the maximum
  *     number of instances to return.
  * @return {Array or undefined} The objects constructed by this function.
  */
 FunctionMirror.prototype.constructedBy = function(opt_max_instances) {
   if (this.resolved()) {
     // Find all objects constructed from this function.
     var result = %DebugConstructedBy(this.value_, opt_max_instances || 0);
 
@@ skipping 1250 matching lines @@
     content.name = mirror.name();
     if (!IS_UNDEFINED(mirror.inferredName())) {
       content.inferredName = mirror.inferredName();
     }
     content.resolved = mirror.resolved();
     if (mirror.resolved()) {
       content.source = mirror.source();
     }
     if (mirror.script()) {
       content.script = this.serializeReference(mirror.script());
+      content.scriptId = mirror.script().id();
+      
+      serializeLocationFields(mirror.sourceLocation(), content);
     }
   }
 
   // Add date specific properties.
   if (mirror.isDate()) {
     // Add date specific properties.
     content.value = mirror.value();
   }
 
   // Add actual properties - named properties followed by indexed properties.
@@ skipping 12 matching lines @@
     p[propertyNames.length + i] = this.serializeProperty_(propertyMirror);
     if (details) {
       this.add_(propertyMirror.value());
     }
   }
   content.properties = p;
 }
 
 
 /**
+ * Serialize location information to the following JSON format:
+ *
+ *   "position":"<position>",
+ *   "line":"<line>",
+ *   "column":"<column>",
+ * 
+ * @param {SourceLocation} location The location to serialize, may be undefined.
+ */
+function serializeLocationFields (location, content) {
+  if (!location) {
+    return;
+  }                                                                     
+  content.position = location.position;
+  var line = location.line;
+  if (!IS_UNDEFINED(line)) {
+    content.line = line;
+  }
+  var column = location.column;
+  if (!IS_UNDEFINED(column)) {
+    content.column = column;
+  }
+}
+
+
+/**
  * Serialize property information to the following JSON format for building the
  * array of properties.
  *
  *   {"name":"<property name>",
  *    "attributes":<number>,
  *    "propertyType":<number>,
  *    "ref":<number>}
  *
  * If the attribute for the property is PropertyAttribute.None it is not added.
  * If the propertyType for the property is PropertyType.Normal it is not added.
@@ skipping 47 matching lines @@
   }
   content.arguments = x;
   var x = new Array(mirror.localCount());
   for (var i = 0; i < mirror.localCount(); i++) {
     var local = {};
     local.name = mirror.localName(i);
     local.value = this.serializeReference(mirror.localValue(i));
     x[i] = local;
   }
   content.locals = x;
-  content.position = mirror.sourcePosition();
-  var line = mirror.sourceLine();
-  if (!IS_UNDEFINED(line)) {
-    content.line = line;
-  }
-  var column = mirror.sourceColumn();
-  if (!IS_UNDEFINED(column)) {
-    content.column = column;
-  }
+  serializeLocationFields(mirror.sourceLocation(), content);
   var source_line_text = mirror.sourceLineText();
   if (!IS_UNDEFINED(source_line_text)) {
     content.sourceLineText = source_line_text;
   }
   
   content.scopes = [];
   for (var i = 0; i < mirror.scopeCount(); i++) {
     var scope = mirror.scope(i);
     content.scopes.push({
       type: scope.scopeType(),
@@ skipping 28 matching lines @@
   }
   if (!isFinite(value)) {
     if (value > 0) {
       return 'Infinity';
     } else {
       return '-Infinity';
     }
   }
   return value; 
 }