Added handles to the mirror objects. When a mirror for an object is created...

test/mjsunit/mirror-regexp.js

 // Copyright 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 21 matching lines @@
                      debug.PropertyAttribute.DontEnum |
                      debug.PropertyAttribute.DontDelete;
 var expected_attributes = {
   'source': all_attributes,
   'global': all_attributes,
   'ignoreCase': all_attributes,
   'multiline': all_attributes,
   'lastIndex': debug.PropertyAttribute.DontEnum | debug.PropertyAttribute.DontDelete
 };
 
+function MirrorRefCache(json_refs) {
+  var tmp = eval('(' + json_refs + ')');
+  this.refs_ = [];
+  for (var i = 0; i < tmp.length; i++) {
+    this.refs_[tmp[i].handle] = tmp[i];
+  }
+}
+
+MirrorRefCache.prototype.lookup = function(handle) {
+  return this.refs_[handle];
+}
+
 function testRegExpMirror(r) {
   // Create mirror and JSON representation.
   var mirror = debug.MakeMirror(r);
-  var json = mirror.toJSONProtocol(true);
+  var serializer = debug.MakeMirrorSerializer();
+  var json = serializer.serializeValue(mirror);
+  var refs = new MirrorRefCache(serializer.serializeReferencedObjects());
 
   // Check the mirror hierachy.
   assertTrue(mirror instanceof debug.Mirror);
   assertTrue(mirror instanceof debug.ValueMirror);
   assertTrue(mirror instanceof debug.ObjectMirror);
   assertTrue(mirror instanceof debug.RegExpMirror);
 
   // Check the mirror properties.
   assertTrue(mirror.isRegExp());
   assertEquals('regexp', mirror.type());
   assertFalse(mirror.isPrimitive());
-  assertEquals(mirror.source(), r.source, 'source');
-  assertEquals(mirror.global(), r.global, 'global');
-  assertEquals(mirror.ignoreCase(), r.ignoreCase, 'ignoreCase');
-  assertEquals(mirror.multiline(), r.multiline, 'multiline');
   for (var p in expected_attributes) {
     assertEquals(mirror.property(p).attributes(),
                  expected_attributes[p],
                  p + ' attributes');
   }
 
   // Test text representation
   assertEquals('/' + r.source + '/', mirror.toText());
 
   // Parse JSON representation and check.
   var fromJSON = eval('(' + json + ')');
   assertEquals('regexp', fromJSON.type);
   assertEquals('RegExp', fromJSON.className);
-  assertEquals(fromJSON.source, r.source, 'source');
-  assertEquals(fromJSON.global, r.global, 'global');
-  assertEquals(fromJSON.ignoreCase, r.ignoreCase, 'ignoreCase');
-  assertEquals(fromJSON.multiline, r.multiline, 'multiline');
   for (var p in expected_attributes) {
     for (var i = 0; i < fromJSON.properties.length; i++) {
       if (fromJSON.properties[i].name == p) {
-        assertEquals(fromJSON.properties[i].attributes,
-                     expected_attributes[p],
-                     p + ' attributes');
+        assertEquals(expected_attributes[p],
+                     fromJSON.properties[i].attributes,
+                     'Unexpected value for ' + p + ' attributes');
+        assertEquals(mirror.property(p).propertyType(),
+                     fromJSON.properties[i].propertyType,
+                     'Unexpected value for ' + p + ' propertyType');
+        assertEquals(mirror.property(p).value().handle(),
+                     fromJSON.properties[i].ref,
+                     'Unexpected handle for ' + p);
+        assertEquals(mirror.property(p).value().value(),
+                     refs.lookup(fromJSON.properties[i].ref).value,
+                     'Unexpected value for ' + p);
       }
     }
   }
 }
 
 
 // Test Date values.
 testRegExpMirror(/x/);
 testRegExpMirror(/[abc]/);
 testRegExpMirror(/[\r\n]/g);
 testRegExpMirror(/a*b/gmi);