Tidy up the service protocol. Begin improving the documentation.

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 4102 matching lines @@
   const Script& script = Script::Handle(this->script());
   if (!script.IsNull()) {
     jsobj.AddProperty("script", script);
     jsobj.AddProperty("tokenPos", token_pos());
     jsobj.AddProperty("endTokenPos", ComputeEndTokenPos());
   }
   {
     JSONArray interfaces_array(&jsobj, "interfaces");
     const Array& interface_array = Array::Handle(interfaces());
     Type& interface_type = Type::Handle();
-    Class& interface_cls = Class::Handle();
     if (!interface_array.IsNull()) {
       for (intptr_t i = 0; i < interface_array.Length(); ++i) {
-        // TODO(turnidge): Use the Type directly once regis has added
-        // types to the vmservice.
         interface_type ^= interface_array.At(i);
-        if (interface_type.HasResolvedTypeClass()) {
-          interface_cls = interface_type.type_class();
-          interfaces_array.AddValue(interface_cls);
-        }
+        interfaces_array.AddValue(interface_type);
       }
     }
   }
   {
     JSONArray fields_array(&jsobj, "fields");
     const Array& field_array = Array::Handle(fields());
     Field& field = Field::Handle();
     if (!field_array.IsNull()) {
       for (intptr_t i = 0; i < field_array.Length(); ++i) {
         field ^= field_array.At(i);
@@ skipping 280 matching lines @@
   ObjectStore* object_store = isolate->object_store();
   const Array& table = Array::Handle(object_store->canonical_type_arguments());
   ASSERT(table.Length() > 0);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   const intptr_t id = ring->GetIdForObject(raw());
   AddTypeProperties(&jsobj, "TypeArguments", JSONType(), ref);
   jsobj.AddPropertyF("id", "objects/%" Pd "", id);
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(Name());
   AddNameProperties(&jsobj, user_name, vm_name);
-  jsobj.AddProperty("length", Length());
-  jsobj.AddProperty("numInstantiations", NumInstantiations());
   if (ref) {
     return;
   }
   {
     JSONArray jsarr(&jsobj, "types");
     AbstractType& type_arg = AbstractType::Handle();
     for (intptr_t i = 0; i < Length(); i++) {
       type_arg = TypeAt(i);
       jsarr.AddValue(type_arg);
     }
   }
   if (!IsInstantiated()) {
-    JSONArray jsarr(&jsobj, "instantiations");
+    JSONArray jsarr(&jsobj, "_instantiations");
     Array& prior_instantiations = Array::Handle(instantiations());
     ASSERT(prior_instantiations.Length() > 0);  // Always at least a sentinel.
     TypeArguments& type_args = TypeArguments::Handle();
     intptr_t i = 0;
     while (true) {
       if (prior_instantiations.At(i) == Smi::New(StubCode::kNoInstantiator)) {
         break;
       }
       JSONObject instantiation(&jsarr);
       type_args ^= prior_instantiations.At(i);
@@ skipping 16265 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart