Service cleanups...

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 1568 matching lines @@
 static void AddNameProperties(JSONObject* jsobj,
                               const String& name,
                               const String& vm_name) {
   jsobj->AddProperty("name", name.ToCString());
   if (!name.Equals(vm_name)) {
     jsobj->AddProperty("_vmName", vm_name.ToCString());
   }
 }
 
 
-static void AddTypeProperties(JSONObject* jsobj,
-                              const char* user_type,
-                              const char* vm_type,
-                              bool ref) {
-  bool same_type = (strcmp(user_type, vm_type) == 0);
+void Object::AddCommonObjectProperties(JSONObject* jsobj,
+                                       const char* protocol_type,
+                                       bool ref) const {
+  const char* vm_type = JSONType();
+  bool same_type = (strcmp(protocol_type, vm_type) == 0);
   if (ref) {
-    jsobj->AddPropertyF("type", "@%s", user_type);
+    jsobj->AddPropertyF("type", "@%s", protocol_type);
   } else {
-    jsobj->AddProperty("type", user_type);
+    jsobj->AddProperty("type", protocol_type);
   }
   if (!same_type) {
     jsobj->AddProperty("_vmType", vm_type);
   }
+  if (!ref || IsInstance()) {
+    // TODO(turnidge): Provide the type arguments here too?
+    const Class& cls = Class::Handle(this->clazz());
+    jsobj->AddProperty("class", cls);
+  }
+  if (!ref) {
+    if (raw()->IsHeapObject()) {
+      jsobj->AddProperty("size", raw()->Size());
+    } else {
+      jsobj->AddProperty("size", (intptr_t)0);
+    }
+  }
 }
 
 
 void Object::PrintJSON(JSONStream* stream, bool ref) const {
   if (IsNull()) {
     JSONObject jsobj(stream);
-    AddTypeProperties(&jsobj, "Instance", JSONType(), ref);
+    AddCommonObjectProperties(&jsobj, "Instance", ref);
     jsobj.AddProperty("kind", "Null");
     jsobj.AddFixedServiceId("objects/null");
     jsobj.AddProperty("valueAsString", "null");
-    if (!ref) {
-      const Class& cls = Class::Handle(this->clazz());
-      jsobj.AddProperty("class", cls);
-      jsobj.AddProperty("size", raw()->Size());
-    }
   } else {
     PrintJSONImpl(stream, ref);
   }
 }
 
 
 void Object::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Object", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Object", ref);
   jsobj.AddServiceId(*this);
   if (ref) {
     return;
   }
-  Class& cls = Class::Handle(this->clazz());
-  jsobj.AddProperty("class", cls);
-  jsobj.AddProperty("size", raw()->Size());
 }
 
 
 RawString* Object::DictionaryName() const {
   return String::null();
 }
 
 
 void Object::InitializeObject(uword address, intptr_t class_id, intptr_t size) {
   // TODO(iposva): Get a proper halt instruction from the assembler which
@@ skipping 2461 matching lines @@
   intptr_t len = OS::SNPrint(NULL, 0, format, library_name, class_name) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, format, library_name, class_name);
   return chars;
 }
 
 
 void Class::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   if ((raw() == Class::null()) || (id() == kFreeListElement)) {
-    // TODO(turnidge): This is weird.  See if there is another way to
-    // handle this.
+    // TODO(turnidge): This is weird and needs to be changed.
     jsobj.AddProperty("type", "null");
     return;
   }
-  AddTypeProperties(&jsobj, "Class", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Class", ref);
   jsobj.AddFixedServiceId("classes/%" Pd "", id());
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(Name());
   AddNameProperties(&jsobj, user_name, vm_name);
   if (ref) {
     return;
   }
 
   const Error& err = Error::Handle(EnsureIsFinalized(Isolate::Current()));
   if (!err.IsNull()) {
@@ skipping 307 matching lines @@
 
 void TypeArguments::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   // The index in the canonical_type_arguments table cannot be used as part of
   // the object id (as in typearguments/id), because the indices are not
   // preserved when the table grows and the entries get rehashed. Use the ring.
   Isolate* isolate = Isolate::Current();
   ObjectStore* object_store = isolate->object_store();
   const Array& table = Array::Handle(object_store->canonical_type_arguments());
   ASSERT(table.Length() > 0);
-  AddTypeProperties(&jsobj, "TypeArguments", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "TypeArguments", ref);
   jsobj.AddServiceId(*this);
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(Name());
   AddNameProperties(&jsobj, user_name, vm_name);
   if (ref) {
     return;
   }
   {
     JSONArray jsarr(&jsobj, "types");
     AbstractType& type_arg = AbstractType::Handle();
@@ skipping 2424 matching lines @@
 }
 
 
 void Function::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Class& cls = Class::Handle(Owner());
   ASSERT(!cls.IsNull());
   Error& err = Error::Handle();
   err ^= cls.EnsureIsFinalized(Isolate::Current());
   ASSERT(err.IsNull());
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Function", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Function", ref);
   AddFunctionServiceId(jsobj, *this, cls);
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(name());
   AddNameProperties(&jsobj, user_name, vm_name);
   const Function& parent = Function::Handle(parent_function());
   if (!parent.IsNull()) {
     jsobj.AddProperty("owner", parent);
   } else if (cls.IsTopLevel()) {
     const Library& library = Library::Handle(cls.library());
     jsobj.AddProperty("owner", library);
@@ skipping 327 matching lines @@
   OS::SNPrint(chars, len, kFormat, cls_name, field_name, kF0, kF1, kF2);
   return chars;
 }
 
 void Field::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   Class& cls = Class::Handle(owner());
   intptr_t id = cls.FindFieldIndex(*this);
   ASSERT(id >= 0);
   intptr_t cid = cls.id();
-  AddTypeProperties(&jsobj, "Field", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Field", ref);
   jsobj.AddFixedServiceId("classes/%" Pd "/fields/%" Pd "", cid, id);
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(name());
   AddNameProperties(&jsobj, user_name, vm_name);
   if (cls.IsTopLevel()) {
     const Library& library = Library::Handle(cls.library());
     jsobj.AddProperty("owner", library);
   } else {
     jsobj.AddProperty("owner", cls);
   }
@@ skipping 763 matching lines @@
 }
 
 
 const char* TokenStream::ToCString() const {
   return "TokenStream";
 }
 
 
 void TokenStream::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Object", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Object", ref);
   // TODO(johnmccutchan): Generate a stable id. TokenStreams hang off
   // a Script object but do not have a back reference to generate a stable id.
   jsobj.AddServiceId(*this);
   if (ref) {
     return;
   }
-  Class& cls = Class::Handle(this->clazz());
-  jsobj.AddProperty("class", cls);
-  jsobj.AddProperty("size", raw()->Size());
   const String& private_key = String::Handle(PrivateKey());
   jsobj.AddProperty("privateKey", private_key);
   // TODO(johnmccutchan): Add support for printing LiteralTokens and add
   // them to members array.
   JSONArray members(&jsobj, "members");
 }
 
 
 TokenStream::Iterator::Iterator(const TokenStream& tokens,
                                 intptr_t token_pos,
@@ skipping 504 matching lines @@
       }
     }
   }
   return Library::null();
 }
 
 
 // See also Dart_ScriptGetTokenInfo.
 void Script::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Script", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Script", ref);
   const String& uri = String::Handle(url());
   ASSERT(!uri.IsNull());
   const String& encoded_uri = String::Handle(String::EncodeIRI(uri));
   ASSERT(!encoded_uri.IsNull());
   const Library& lib = Library::Handle(FindLibrary());
   // TODO(rmacnak): This can fail for eval scripts. Use a ring-id for those.
   intptr_t lib_index = (lib.IsNull()) ? -1 : lib.index();
   jsobj.AddFixedServiceId("libraries/%" Pd "/scripts/%s",
       lib_index, encoded_uri.ToCString());
   jsobj.AddPropertyStr("uri", uri);
@@ skipping 1330 matching lines @@
   OS::SNPrint(chars, len, kFormat, name.ToCString());
   return chars;
 }
 
 
 void Library::PrintJSONImpl(JSONStream* stream, bool ref) const {
   const char* library_name = String::Handle(name()).ToCString();
   intptr_t id = index();
   ASSERT(id >= 0);
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Library", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Library", ref);
   jsobj.AddFixedServiceId("libraries/%" Pd "", id);
   jsobj.AddProperty("name", library_name);
   const String& library_url = String::Handle(url());
   jsobj.AddPropertyStr("uri", library_url);
   if (ref) {
     return;
   }
   jsobj.AddProperty("debuggable", IsDebuggable());
   {
     JSONArray jsarr(&jsobj, "classes");
@@ skipping 839 matching lines @@
                          KindAsStr(iter.Kind()),
                          iter.DeoptId(),
                          iter.TokenPos(),
                          iter.TryIndex());
   }
   return buffer;
 }
 
 
 void PcDescriptors::PrintToJSONObject(JSONObject* jsobj, bool ref) const {
-  AddTypeProperties(jsobj, "Object", JSONType(), ref);
+  AddCommonObjectProperties(jsobj, "Object", ref);
   // TODO(johnmccutchan): Generate a stable id. PcDescriptors hang off a Code
   // object but do not have a back reference to generate an ID.
   jsobj->AddServiceId(*this);
   if (ref) {
     return;
   }
-  Class& cls = Class::Handle(this->clazz());
-  jsobj->AddProperty("class", cls);
-  jsobj->AddProperty("size", raw()->Size());
   JSONArray members(jsobj, "members");
   Iterator iter(*this, RawPcDescriptors::kAnyKind);
   while (iter.MoveNext()) {
     JSONObject descriptor(&members);
     descriptor.AddPropertyF("pcOffset", "%" Px "", iter.PcOffset());
     descriptor.AddProperty("kind", KindAsStr(iter.Kind()));
     descriptor.AddProperty("deoptId", iter.DeoptId());
     // TODO(turnidge): Use AddLocation instead.
     descriptor.AddProperty("tokenPos", iter.TokenPos());
     descriptor.AddProperty("tryIndex", iter.TryIndex());
@@ skipping 252 matching lines @@
                               (len - num_chars),
                               i, var_name, info);
   }
   return buffer;
 }
 
 
 void LocalVarDescriptors::PrintJSONImpl(JSONStream* stream,
                                         bool ref) const {
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Object", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Object", ref);
   // TODO(johnmccutchan): Generate a stable id. LocalVarDescriptors hang off
   // a Code object but do not have a back reference to generate an ID.
   jsobj.AddServiceId(*this);
   if (ref) {
     return;
   }
-  Class& cls = Class::Handle(this->clazz());
-  jsobj.AddProperty("class", cls);
-  jsobj.AddProperty("size", raw()->Size());
   JSONArray members(&jsobj, "members");
   String& var_name = String::Handle();
   for (intptr_t i = 0; i < Length(); i++) {
     RawLocalVarDescriptors::VarInfo info;
     var_name = GetName(i);
     GetInfo(i, &info);
     JSONObject var(&members);
     var.AddProperty("name", var_name.ToCString());
     var.AddProperty("index", static_cast<intptr_t>(info.index()));
     var.AddProperty("beginPos", static_cast<intptr_t>(info.begin_pos));
@@ skipping 1650 matching lines @@
 
 
 bool Code::IsFunctionCode() const {
   const Object& obj = Object::Handle(owner());
   return obj.IsFunction();
 }
 
 
 void Code::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Code", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Code", ref);
   jsobj.AddFixedServiceId("code/%" Px64"-%" Px "",
                           compile_timestamp(),
                           EntryPoint());
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(Name());
   AddNameProperties(&jsobj, user_name, vm_name);
   const bool is_stub = IsStubCode() || IsAllocationStubCode();
   if (is_stub) {
     jsobj.AddProperty("kind", "Stub");
   } else {
@@ skipping 278 matching lines @@
   }
   IndentN(indent);
   OS::PrintErr("}\n");
 }
 
 
 void Context::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   // TODO(turnidge): Should the user level type for Context be Context
   // or Object?
-  AddTypeProperties(&jsobj, "Context", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Context", ref);
   jsobj.AddServiceId(*this);
 
   jsobj.AddProperty("length", num_variables());
 
   if (ref) {
     return;
   }
 
-  Class& cls = Class::Handle(this->clazz());
-  jsobj.AddProperty("class", cls);
-
-  jsobj.AddProperty("size", raw()->Size());
-
   const Context& parent_context = Context::Handle(parent());
   jsobj.AddProperty("parent", parent_context);
 
   JSONArray jsarr(&jsobj, "variables");
-  for (intptr_t i = 0; i < num_variables(); i++) {
-    const Object& var = Object::Handle(At(i));
+  Object& var = Object::Handle();
+  for (intptr_t index = 0; index < num_variables(); index++) {
+    var = At(index);
     JSONObject jselement(&jsarr);
-    jselement.AddProperty("index", i);
     jselement.AddProperty("value", var);
   }
 }
 
 
 RawContextScope* ContextScope::New(intptr_t num_variables) {
   ASSERT(Object::context_scope_class() != Class::null());
   if (num_variables < 0 || num_variables > kMaxElements) {
     // This should be caught before we reach here.
     FATAL1("Fatal error in ContextScope::New: invalid num_variables %" Pd "\n",
@@ skipping 377 matching lines @@
 }
 
 
 const char* ApiError::ToCString() const {
   return "ApiError";
 }
 
 
 void ApiError::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Error", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Error", ref);
+  jsobj.AddProperty("kind", "InternalError");
+  jsobj.AddServiceId(*this);
   jsobj.AddProperty("message", ToErrorCString());
 }
 
 
 RawLanguageError* LanguageError::New() {
   ASSERT(Object::language_error_class() != Class::null());
   RawObject* raw = Object::Allocate(LanguageError::kClassId,
                                     LanguageError::InstanceSize(),
                                     Heap::kOld);
   return reinterpret_cast<RawLanguageError*>(raw);
@@ skipping 116 matching lines @@
 }
 
 
 const char* LanguageError::ToCString() const {
   return "LanguageError";
 }
 
 
 void LanguageError::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Error", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Error", ref);
+  jsobj.AddProperty("kind", "LanguageError");
+  jsobj.AddServiceId(*this);
   jsobj.AddProperty("message", ToErrorCString());
 }
 
 
 RawUnhandledException* UnhandledException::New(const Instance& exception,
                                                const Instance& stacktrace,
                                                Heap::Space space) {
   ASSERT(Object::unhandled_exception_class() != Class::null());
   UnhandledException& result = UnhandledException::Handle();
   {
@@ skipping 70 matching lines @@
 
 const char* UnhandledException::ToCString() const {
   return "UnhandledException";
 }
 
 
 
 void UnhandledException::PrintJSONImpl(JSONStream* stream,
                                        bool ref) const {
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Error", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Error", ref);
+  jsobj.AddProperty("kind", "UnhandledException");
+  jsobj.AddServiceId(*this);
   jsobj.AddProperty("message", ToErrorCString());
-
+  if (ref) {
+    return;
+  }
   Instance& instance = Instance::Handle();
   instance = exception();
   jsobj.AddProperty("exception", instance);
   instance = stacktrace();
   jsobj.AddProperty("stacktrace", instance);
 }
 
 
 RawUnwindError* UnwindError::New(const String& message, Heap::Space space) {
   ASSERT(Object::unwind_error_class() != Class::null());
@@ skipping 21 matching lines @@
 }
 
 
 const char* UnwindError::ToCString() const {
   return "UnwindError";
 }
 
 
 void UnwindError::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
-  AddTypeProperties(&jsobj, "Error", JSONType(), ref);
+  AddCommonObjectProperties(&jsobj, "Error", ref);
+  jsobj.AddProperty("kind", "TerminationError");
+  jsobj.AddServiceId(*this);
   jsobj.AddProperty("message", ToErrorCString());
 }
 
 
 RawObject* Instance::Evaluate(const String& expr,
                               const Array& param_names,
                               const Array& param_values) const {
   const Class& cls = Class::Handle(clazz());
   const Function& eval_func =
       Function::Handle(EvaluateHelper(cls, expr, param_names, false));
@@ skipping 422 matching lines @@
     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;
   }
 }
 
 
 void Instance::PrintSharedInstanceJSON(JSONObject* jsobj,
                                        bool ref) const {
-  AddTypeProperties(jsobj, "Instance", JSONType(), ref);
-  Class& cls = Class::Handle(this->clazz());
-  jsobj->AddProperty("class", cls);
-  // TODO(turnidge): Provide the type arguments here too.
+  AddCommonObjectProperties(jsobj, "Instance", ref);
   if (ref) {
     return;
   }
 
-  if (raw()->IsHeapObject()) {
-    jsobj->AddProperty("size", raw()->Size());
-  } else {
-    jsobj->AddProperty("size", (intptr_t)0);
-  }
-
   // Walk the superclass chain, adding all instance fields.
+  Class& cls = Class::Handle(this->clazz());
   {
     Instance& fieldValue = Instance::Handle();
     JSONArray jsarr(jsobj, "fields");
     while (!cls.IsNull()) {
       const Array& field_array = Array::Handle(cls.fields());
       Field& field = Field::Handle();
       if (!field_array.IsNull()) {
         for (intptr_t i = 0; i < field_array.Length(); i++) {
           field ^= field_array.At(i);
           if (!field.is_static()) {
@@ skipping 1333 matching lines @@
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   jsobj.AddProperty("kind", "TypeRef");
   jsobj.AddServiceId(*this);
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(Name());
   AddNameProperties(&jsobj, user_name, vm_name);
   if (ref) {
     return;
   }
-  jsobj.AddProperty("type", AbstractType::Handle(type()));
+  jsobj.AddProperty("targetType", AbstractType::Handle(type()));
 }
 
 
 void TypeParameter::set_is_finalized() const {
   ASSERT(!IsFinalized());
   set_type_state(RawTypeParameter::kFinalizedUninstantiated);
 }
 
 
 bool TypeParameter::IsEquivalent(const Instance& other,
@@ skipping 429 matching lines @@
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   jsobj.AddProperty("kind", "BoundedType");
   jsobj.AddServiceId(*this);
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(Name());
   AddNameProperties(&jsobj, user_name, vm_name);
   if (ref) {
     return;
   }
-  jsobj.AddProperty("type", AbstractType::Handle(type()));
+  jsobj.AddProperty("targetType", AbstractType::Handle(type()));
   jsobj.AddProperty("bound", AbstractType::Handle(bound()));
 }
 
 
 intptr_t MixinAppType::token_pos() const {
   return AbstractType::Handle(MixinTypeAt(0)).token_pos();
 }
 
 
 intptr_t MixinAppType::Depth() const {
@@ skipping 3374 matching lines @@
   jsobj.AddProperty("kind", "List");
   jsobj.AddServiceId(*this);
   jsobj.AddProperty("length", Length());
   if (ref) {
     return;
   }
   {
     JSONArray jsarr(&jsobj, "elements");
     Object& element = Object::Handle();
     for (intptr_t index = 0; index < Length(); index++) {
-      JSONObject jselement(&jsarr);
-      jselement.AddProperty("index", index);
-
       element = At(index);
-      jselement.AddProperty("value", element);
+      jsarr.AddValue(element);
     }
   }
 }
 
 
 RawArray* Array::Grow(const Array& source,
                       intptr_t new_length,
                       Heap::Space space) {
   Isolate* isolate = Isolate::Current();
   const Array& result = Array::Handle(isolate, Array::New(new_length, space));
@@ skipping 222 matching lines @@
   jsobj.AddProperty("kind", "List");
   jsobj.AddServiceId(*this);
   jsobj.AddProperty("length", Length());
   if (ref) {
     return;
   }
   {
     JSONArray jsarr(&jsobj, "elements");
     Object& element = Object::Handle();
     for (intptr_t index = 0; index < Length(); index++) {
-      JSONObject jselement(&jsarr);
-      jselement.AddProperty("index", index);
-
       element = At(index);
-      jselement.AddProperty("value", element);
+      jsarr.AddValue(element);
     }
   }
 }
 
 
 // Equivalent to Dart's operator "==" and hashCode.
 class DefaultHashTraits {
  public:
   static bool IsMatch(const Object& a, const Object& b) {
     if (a.IsNull() || b.IsNull()) {
@@ skipping 1184 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart