Post-meetup feature extravaganza.

runtime/vm/object.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 "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 5976 matching lines @@
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name,
                              static_str, abstract_str, kind_str, const_str) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name,
               static_str, abstract_str, kind_str, const_str);
   return chars;
 }
 
 
 void Function::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  const char* internal_function_name = String::Handle(name()).ToCString();
-  const char* function_name =
+  const char* internal_name = String::Handle(name()).ToCString();
+  const char* user_name =
       String::Handle(QualifiedUserVisibleName()).ToCString();
   Class& cls = Class::Handle(Owner());
   ASSERT(!cls.IsNull());
   Error& err = Error::Handle();
   err ^= cls.EnsureIsFinalized(Isolate::Current());
   ASSERT(err.IsNull());
   intptr_t id = -1;
   const char* selector = NULL;
   if (IsNonImplicitClosureFunction()) {
     id = cls.FindClosureIndex(*this);
     selector = "closures";
   } else if (IsImplicitClosureFunction()) {
     id = cls.FindImplicitClosureFunctionIndex(*this);
     selector = "implicit_closures";
   } else if (IsNoSuchMethodDispatcher() || IsInvokeFieldDispatcher()) {
     id = cls.FindInvocationDispatcherFunctionIndex(*this);
     selector = "dispatchers";
   } else {
     id = cls.FindFunctionIndex(*this);
     selector = "functions";
   }
   ASSERT(id >= 0);
   intptr_t cid = cls.id();
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddPropertyF("id", "classes/%" Pd "/%s/%" Pd "", cid, selector, id);
-  jsobj.AddProperty("name", internal_function_name);
-  jsobj.AddProperty("user_name", function_name);
+  jsobj.AddProperty("name", internal_name);
+  jsobj.AddProperty("user_name", user_name);
   if (ref) return;
   jsobj.AddProperty("is_static", is_static());
   jsobj.AddProperty("is_const", is_const());
   jsobj.AddProperty("is_optimizable", is_optimizable());
   jsobj.AddProperty("is_inlinable", IsInlineable());
   const char* kind_string = Function::KindToCString(kind());
   jsobj.AddProperty("kind", kind_string);
   jsobj.AddProperty("unoptimized_code", Object::Handle(unoptimized_code()));
   jsobj.AddProperty("usage_counter", usage_counter());
   jsobj.AddProperty("optimized_call_site_count", optimized_call_site_count());
@@ skipping 5812 matching lines @@
     // Calculate the size of the string.
     intptr_t len = OS::SNPrint(NULL, 0, kFormat, type_name.ToCString()) + 1;
     char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
     OS::SNPrint(chars, len, kFormat, type_name.ToCString());
     return chars;
   }
 }
 
 
 const char* Instance::ToUserCString(intptr_t max_len, intptr_t nesting) const {
-  if (raw() == Object::sentinel().raw()) {
+  if (IsNull()) {
+    return "null";
+  } else if (raw() == Object::sentinel().raw()) {
     return "<not initialized>";
   } else if (raw() == Object::transition_sentinel().raw()) {
     return "<being initialized>";
   } else {
     return ToCString();
   }
 }
 
 
 void Instance::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  ObjectIdRing* ring = Isolate::Current()->object_id_ring();
-  intptr_t id = ring->GetIdForObject(raw());
+  JSONObject jsobj(stream);
+  Class& cls = Class::Handle(this->clazz());
+  jsobj.AddProperty("preview", ToUserCString(40));
 
-  JSONObject jsobj(stream);
-  jsobj.AddProperty("type", JSONType(ref));
-  jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+  // TODO(turnidge): Handle <optimized out> like other null-like values.
+  if (IsNull()) {
+    jsobj.AddProperty("type", ref ? "@Null" : "Null");
+    jsobj.AddProperty("id", "objects/null");
+    return;
+  } else if (raw() == Object::sentinel().raw()) {
+    jsobj.AddProperty("type", ref ? "@Null" : "Null");
+    jsobj.AddProperty("id", "objects/not-initialized");
+    return;
+  } else if (raw() == Object::transition_sentinel().raw()) {
+    jsobj.AddProperty("type", ref ? "@Null" : "Null");
+    jsobj.AddProperty("id", "objects/being-initialized");
+    return;
+  } else {
+    ObjectIdRing* ring = Isolate::Current()->object_id_ring();
+    intptr_t id = ring->GetIdForObject(raw());
+    jsobj.AddProperty("type", JSONType(ref));
+    jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+    jsobj.AddProperty("class", cls);
+  }
 
-  Class& cls = Class::Handle(this->clazz());
-  jsobj.AddProperty("class", cls);
-
-  // Set the "preview" property for this instance.
-  if (IsNull()) {
-    jsobj.AddProperty("preview", "null");
-  } else {
-    jsobj.AddProperty("preview", ToUserCString(40));
-  }
   if (ref) {
     return;
   }
 
   // Walk the superclass chain, adding all instance fields.
   {
     JSONArray jsarr(&jsobj, "fields");
     while (!cls.IsNull()) {
       const Array& field_array = Array::Handle(cls.fields());
       Field& field = Field::Handle();
@@ skipping 1995 matching lines @@
   const char* kFormat = "%ld";
   // Calculate the size of the string.
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, Value()) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, Value());
   return chars;
 }
 
 
 void Smi::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Number::PrintToJSONStream(stream, ref);
+  JSONObject jsobj(stream);
+  jsobj.AddProperty("type", JSONType(ref));
+  jsobj.AddPropertyF("id", "objects/int/%" Pd "", Value());
+  class Class& cls = Class::Handle(this->clazz());
+  jsobj.AddProperty("class", cls);
+  jsobj.AddPropertyF("preview", "%" Pd "", Value());
 }
 
 
 RawClass* Smi::Class() {
   return Isolate::Current()->object_store()->smi_class();
 }
 
 
 void Mint::set_value(int64_t value) const {
   raw_ptr()->value_ = value;
@@ skipping 2007 matching lines @@
   return result.raw();
 }
 
 
 const char* Bool::ToCString() const {
   return value() ? "true" : "false";
 }
 
 
 void Bool::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+  const char* str = ToCString();
+  JSONObject jsobj(stream);
+  jsobj.AddProperty("type", JSONType(ref));
+  jsobj.AddPropertyF("id", "objects/bool/%s", str);
+  class Class& cls = Class::Handle(this->clazz());
+  jsobj.AddProperty("class", cls);
+  jsobj.AddPropertyF("preview", "%s", str);
 }
 
 
 bool Array::Equals(const Instance& other) const {
   if (this->raw() == other.raw()) {
     // Both handles point to the same raw instance.
     return true;
   }
 
   // An Array may be compared to an ImmutableArray.
@@ skipping 318 matching lines @@
   // Figure out how many elements will fit in the string.
   int i = 0;
   while (i < Length()) {
     if (i == kMaxPrintElements) {
       if (i < Length()) {
         truncate = true;
       }
       break;
     }
     obj = At(i);
-    if (!obj.IsInstance()) {
-      // Bail.
+    if (!obj.IsNull() && !obj.IsInstance()) {
       UNREACHABLE();
       return "[<invalid list>]";
     }
     element ^= obj.raw();
 
     // Choose max child length.  This is chosen so that it is small
     // enough to maybe fit but not so small that we can't print
     // anything.
     int child_max_len = max_len - print_len;
     if ((i + 1) < Length()) {
@@ skipping 818 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart