Changes to the mirror handling...

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 40 matching lines @@
  * @param {value or Object} value the value or object to retreive the mirror for
  * @returns {Mirror} the mirror reflects the passed value or object
  */
 function MakeMirror(value) {
   var mirror;
   for (id in mirror_cache_) {
     mirror = mirror_cache_[id];
     if (mirror.value() === value) {
       return mirror;
     }
+    // Special check for NaN as NaN == NaN is false.
+    if (mirror.isNumber() && isNaN(mirror.value()) &&
+        typeof value == 'number' && isNaN(value)) {
+      return mirror;
+    }
   }
   
   if (IS_UNDEFINED(value)) {
     mirror = new UndefinedMirror();
   } else if (IS_NULL(value)) {
     mirror = new NullMirror();
   } else if (IS_BOOLEAN(value)) {
     mirror = new BooleanMirror(value);
   } else if (IS_NUMBER(value)) {
     mirror = new NumberMirror(value);
@@ skipping 264 matching lines @@
 
 /**
  * Check whether the mirror reflects a script.
  * @returns {boolean} True if the mirror reflects a script
  */
 Mirror.prototype.isScript = function() {
   return this instanceof ScriptMirror;
 }
 
 
+/**
+ * Allocate a handle id for this object.
+ */
+Mirror.prototype.allocateHandle_ = function() {
+  this.handle_ = next_handle_++;
+}
+
+
 Mirror.prototype.toText = function() {
   // Simpel to text which is used when on specialization in subclass.
   return "#<" + builtins.GetInstanceName(this.constructor.name) + ">";
 }
 
 
 /**
  * Base class for all value mirror objects.
  * @param {string} type The type of the mirror
  * @param {value} value The value reflected by this mirror
  * @constructor
  * @extends Mirror
  */
 function ValueMirror(type, value) {
   Mirror.call(this, type);
-  this.handle_ = next_handle_++;
   this.value_ = value;
+  this.allocateHandle_();
 }
 inherits(ValueMirror, Mirror);
 
 
 Mirror.prototype.handle = function() {
   return this.handle_;
 };
 
 
 /**
@@ skipping 1137 matching lines @@
 
 /**
  * Mirror object for script source.
  * @param {Script} script The script object
  * @constructor
  * @extends Mirror
  */
 function ScriptMirror(script) {
   Mirror.call(this, SCRIPT_TYPE);
   this.script_ = script;
+  this.allocateHandle_();
 }
 inherits(ScriptMirror, Mirror);
 
 
 ScriptMirror.prototype.name = function() {
   return this.script_.name;
 };
 
 
 ScriptMirror.prototype.lineOffset = function() {
@@ skipping 120 matching lines @@
     }
   }
   
   // Add the mirror to the list of mirrors to be serialized.
   this.mirrors_.push(mirror);
 }
 
 
 JSONProtocolSerializer.prototype.serialize_ = function(mirror, reference,
                                                        details) {
-  // If serializing a reference to a value just return the reference and add the
-  // mirror to the referenced mirrors.
-  if (reference && mirror.isValue()) {
+  // If serializing a reference to a mirror just return the reference and add
+  // the mirror to the referenced mirrors.
+  if (reference &&
+      (mirror.isValue() || mirror.isScript())) {
     this.add_(mirror);
     return '{"ref":' + mirror.handle() + '}';
   }
   
   // Collect the JSON property/value pairs in an array.
   var content = new Array();
 
   // Add the handle for value mirrors.
   if (mirror.isValue()) {
     content.push(MakeJSONPair_('handle', NumberToJSON_(mirror.handle())));
@@ skipping 106 matching lines @@
   
   // Add function specific properties.
   if (mirror.isFunction()) {
     // Add function specific properties.
     content.push(MakeJSONPair_('name', StringToJSON_(mirror.name())));
     content.push(MakeJSONPair_('resolved', BooleanToJSON_(mirror.resolved())));
     if (mirror.resolved()) {
       content.push(MakeJSONPair_('source', StringToJSON_(mirror.source())));
     }
     if (mirror.script()) {
-      content.push(MakeJSONPair_('script', this.serializeValue(mirror.script())));
+      content.push(MakeJSONPair_('script', this.serializeReference(mirror.script())));
     }
   }
 
   // Add date specific properties.
   if (mirror.isDate()) {
     // Add date specific properties.
     content.push(MakeJSONPair_('value', DateToJSON_(mirror.value())));
   }
 
   // Add actual properties - named properties followed by indexed properties.
@@ skipping 226 matching lines @@
 /**
  * Convert a Date to ISO 8601 format. To avoid depending on the Date object
  * this method calls the functions in date.js directly and not through the
  * value.
  * @param {Date} value The Date value to format as JSON
  * @return {string} JSON formatted Date value
  */
 function DateToJSON_(value) {
   return '"' + DateToISO8601_(value) + '"';
 }