Always use the same json for null in the vm service.

runtime/vm/service.cc

 // Copyright (c) 2013, 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/service.h"
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 668 matching lines @@
           // TODO(johnmccutchan): Support asynchronous replies.
           js.PostReply();
         }
       }
     }
   }
 }
 
 
 static bool HandleIsolate(Isolate* isolate, JSONStream* js) {
-  isolate->PrintToJSONStream(js, false);
+  isolate->PrintJSON(js, false);
   return true;
 }
 
 
 static bool HandleStackTrace(Isolate* isolate, JSONStream* js) {
   if (js->num_arguments() > 1) {
     PrintError(js, "Command too long");
     return true;
   }
   DebuggerStackTrace* stack = isolate->debugger()->StackTrace();
@@ skipping 179 matching lines @@
                  js->num_arguments());
       return true;
     }
     const String& expr_str = String::Handle(isolate, String::New(expr));
     ASSERT(obj.IsInstance());
     const Instance& instance = Instance::Cast(obj);
     const Object& result =
         Object::Handle(instance.Evaluate(expr_str,
                                          Array::empty_array(),
                                          Array::empty_array()));
-    if (result.IsNull()) {
-      Object::null_instance().PrintToJSONStream(js, true);
-    } else {
-      result.PrintToJSONStream(js, true);
-    }
+    result.PrintJSON(js, true);
     return true;
   }
 
   PrintError(js, "unrecognized action '%s'\n", action);
   return true;
 }
 
 
 static bool HandleClassesClosures(Isolate* isolate, const Class& cls,
                                   JSONStream* js) {
   intptr_t id;
   if (js->num_arguments() > 4) {
     PrintError(js, "Command too long");
     return true;
   }
   if (!GetIntegerId(js->GetArgument(3), &id)) {
     PrintError(js, "Must specify collection object id: closures/id");
     return true;
   }
   Function& func = Function::Handle();
   func ^= cls.ClosureFunctionFromIndex(id);
   if (func.IsNull()) {
     PrintError(js, "Closure function %" Pd " not found", id);
     return true;
   }
-  func.PrintToJSONStream(js, false);
+  func.PrintJSON(js, false);
   return true;
 }
 
 
 static bool HandleClassesEval(Isolate* isolate, const Class& cls,
                               JSONStream* js) {
   if (js->num_arguments() > 3) {
     PrintError(js, "Command too long");
     return true;
   }
   const char* expr = js->LookupOption("expr");
   if (expr == NULL) {
     PrintError(js, "eval expects an 'expr' option\n",
                js->num_arguments());
     return true;
   }
   const String& expr_str = String::Handle(isolate, String::New(expr));
   const Object& result = Object::Handle(cls.Evaluate(expr_str,
                                                      Array::empty_array(),
                                                      Array::empty_array()));
-  if (result.IsNull()) {
-    Object::null_instance().PrintToJSONStream(js, true);
-  } else {
-    result.PrintToJSONStream(js, true);
-  }
+  result.PrintJSON(js, true);
   return true;
 }
 
 
 static bool HandleClassesDispatchers(Isolate* isolate, const Class& cls,
                                      JSONStream* js) {
   intptr_t id;
   if (js->num_arguments() > 4) {
     PrintError(js, "Command too long");
     return true;
   }
   if (!GetIntegerId(js->GetArgument(3), &id)) {
     PrintError(js, "Must specify collection object id: dispatchers/id");
     return true;
   }
   Function& func = Function::Handle();
   func ^= cls.InvocationDispatcherFunctionFromIndex(id);
   if (func.IsNull()) {
     PrintError(js, "Dispatcher %" Pd " not found", id);
     return true;
   }
-  func.PrintToJSONStream(js, false);
+  func.PrintJSON(js, false);
   return true;
 }
 
 
 static bool HandleClassesFunctions(Isolate* isolate, const Class& cls,
                                    JSONStream* js) {
   intptr_t id;
   if (js->num_arguments() > 4) {
     PrintError(js, "Command too long");
     return true;
   }
   if (!GetIntegerId(js->GetArgument(3), &id)) {
     PrintError(js, "Must specify collection object id: functions/id");
     return true;
   }
   Function& func = Function::Handle();
   func ^= cls.FunctionFromIndex(id);
   if (func.IsNull()) {
     PrintError(js, "Function %" Pd " not found", id);
     return true;
   }
-  func.PrintToJSONStream(js, false);
+  func.PrintJSON(js, false);
   return true;
 }
 
 
 static bool HandleClassesImplicitClosures(Isolate* isolate, const Class& cls,
                                           JSONStream* js) {
   intptr_t id;
   if (js->num_arguments() > 4) {
     PrintError(js, "Command too long");
     return true;
   }
   if (!GetIntegerId(js->GetArgument(3), &id)) {
     PrintError(js, "Must specify collection object id: implicit_closures/id");
     return true;
   }
   Function& func = Function::Handle();
   func ^= cls.ImplicitClosureFunctionFromIndex(id);
   if (func.IsNull()) {
     PrintError(js, "Implicit closure function %" Pd " not found", id);
     return true;
   }
-  func.PrintToJSONStream(js, false);
+  func.PrintJSON(js, false);
   return true;
 }
 
 
 static bool HandleClassesFields(Isolate* isolate, const Class& cls,
                                 JSONStream* js) {
   intptr_t id;
   if (js->num_arguments() > 4) {
     PrintError(js, "Command too long");
     return true;
   }
   if (!GetIntegerId(js->GetArgument(3), &id)) {
     PrintError(js, "Must specify collection object id: fields/id");
     return true;
   }
   Field& field = Field::Handle(cls.FieldFromIndex(id));
   if (field.IsNull()) {
     PrintError(js, "Field %" Pd " not found", id);
     return true;
   }
-  field.PrintToJSONStream(js, false);
+  field.PrintJSON(js, false);
   return true;
 }
 
 
 static bool HandleClassesTypes(Isolate* isolate, const Class& cls,
                                JSONStream* js) {
   if (js->num_arguments() == 3) {
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "TypeList");
     JSONArray members(&jsobj, "members");
@@ skipping 11 matching lines @@
     PrintError(js, "Must specify collection object id: types/id");
     return true;
   }
   Type& type = Type::Handle();
   type ^= cls.CanonicalTypeFromIndex(id);
   if (type.IsNull()) {
     PrintError(js, "Canonical type %" Pd " not found", id);
     return true;
   }
   if (js->num_arguments() == 4) {
-    type.PrintToJSONStream(js, false);
+    type.PrintJSON(js, false);
     return true;
   }
   return HandleInstanceCommands(isolate, type, js, 4);
 }
 
 
 static bool HandleClasses(Isolate* isolate, JSONStream* js) {
   if (js->num_arguments() == 1) {
     ClassTable* table = isolate->class_table();
     JSONObject jsobj(js);
     table->PrintToJSONObject(&jsobj);
     return true;
   }
   ASSERT(js->num_arguments() >= 2);
   intptr_t id;
   if (!GetIntegerId(js->GetArgument(1), &id)) {
     PrintError(js, "Must specify collection object id: /classes/id");
     return true;
   }
   ClassTable* table = isolate->class_table();
   if (!table->IsValidIndex(id)) {
     PrintError(js, "%" Pd " is not a valid class id.", id);
     return true;
   }
   Class& cls = Class::Handle(table->At(id));
   if (js->num_arguments() == 2) {
-    cls.PrintToJSONStream(js, false);
+    cls.PrintJSON(js, false);
     return true;
   } else if (js->num_arguments() >= 3) {
     const char* second = js->GetArgument(2);
     if (strcmp(second, "eval") == 0) {
       return HandleClassesEval(isolate, cls, js);
     } else if (strcmp(second, "closures") == 0) {
       return HandleClassesClosures(isolate, cls, js);
     } else if (strcmp(second, "fields") == 0) {
       return HandleClassesFields(isolate, cls, js);
     } else if (strcmp(second, "functions") == 0) {
@@ skipping 23 matching lines @@
   const char* expr = js->LookupOption("expr");
   if (expr == NULL) {
     PrintError(js, "eval expects an 'expr' option\n",
                js->num_arguments());
     return true;
   }
   const String& expr_str = String::Handle(isolate, String::New(expr));
   const Object& result = Object::Handle(lib.Evaluate(expr_str,
                                                      Array::empty_array(),
                                                      Array::empty_array()));
-  if (result.IsNull()) {
-    Object::null_instance().PrintToJSONStream(js, true);
-  } else {
-    result.PrintToJSONStream(js, true);
-  }
+  result.PrintJSON(js, true);
   return true;
 }
 
 
 static bool HandleLibraries(Isolate* isolate, JSONStream* js) {
   // TODO(johnmccutchan): Support fields and functions on libraries.
   REQUIRE_COLLECTION_ID("libraries");
   const GrowableObjectArray& libs =
       GrowableObjectArray::Handle(isolate->object_store()->libraries());
   ASSERT(!libs.IsNull());
   intptr_t id = 0;
   CHECK_COLLECTION_ID_BOUNDS("libraries", libs.Length(), js->GetArgument(1),
                              id, js);
   Library& lib = Library::Handle();
   lib ^= libs.At(id);
   ASSERT(!lib.IsNull());
   if (js->num_arguments() == 2) {
-    lib.PrintToJSONStream(js, false);
+    lib.PrintJSON(js, false);
     return true;
   } else if (js->num_arguments() >= 3) {
     const char* second = js->GetArgument(2);
     if (strcmp(second, "eval") == 0) {
       return HandleLibrariesEval(isolate, lib, js);
     } else {
       PrintError(js, "Invalid sub collection %s", second);
       return true;
     }
   }
@@ skipping 54 matching lines @@
     return true;
   }
   const char* arg = js->GetArgument(1);
 
   // Handle special objects first.
   if (strcmp(arg, "null") == 0) {
     if (js->num_arguments() > 2) {
       PrintError(js, "expected at most 2 arguments but found %" Pd "\n",
                  js->num_arguments());
     } else {
-      Instance::null_instance().PrintToJSONStream(js, false);
+      Instance::null_instance().PrintJSON(js, false);
     }
     return true;
 
   } else if (strcmp(arg, "not-initialized") == 0) {
     if (js->num_arguments() > 2) {
       PrintError(js, "expected at most 2 arguments but found %" Pd "\n",
                  js->num_arguments());
     } else {
-      Object::sentinel().PrintToJSONStream(js, false);
+      Object::sentinel().PrintJSON(js, false);
     }
     return true;
 
   } else if (strcmp(arg, "being-initialized") == 0) {
     if (js->num_arguments() > 2) {
       PrintError(js, "expected at most 2 arguments but found %" Pd "\n",
                  js->num_arguments());
     } else {
-      Object::transition_sentinel().PrintToJSONStream(js, false);
+      Object::transition_sentinel().PrintJSON(js, false);
     }
     return true;
 
   } else if (strcmp(arg, "optimized-out") == 0) {
     if (js->num_arguments() > 2) {
       PrintError(js, "expected at most 2 arguments but found %" Pd "\n",
                  js->num_arguments());
     } else {
-      Symbols::OptimizedOut().PrintToJSONStream(js, false);
+      Symbols::OptimizedOut().PrintJSON(js, false);
     }
     return true;
 
   } else if (strcmp(arg, "collected") == 0) {
     if (js->num_arguments() > 2) {
       PrintError(js, "expected at most 2 arguments but found %" Pd "\n",
                  js->num_arguments());
     } else {
       PrintPseudoNull(js, "objects/collected", "<collected>");
     }
@@ skipping 21 matching lines @@
     // Print.
     if (obj.IsNull()) {
       // The object has been collected by the gc.
       PrintPseudoNull(js, "objects/collected", "<collected>");
       return true;
     } else if (obj.raw() == Object::sentinel().raw()) {
       // The object id has expired.
       PrintPseudoNull(js, "objects/expired", "<expired>");
       return true;
     }
-    obj.PrintToJSONStream(js, false);
+    obj.PrintJSON(js, false);
     return true;
   }
   return HandleInstanceCommands(isolate, obj, js, 2);
 }
 
 
 static bool HandleScriptsEnumerate(Isolate* isolate, JSONStream* js) {
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "ScriptList");
   jsobj.AddProperty("id", "scripts");
@@ skipping 35 matching lines @@
     ASSERT(!lib.IsNull());
     ASSERT(Smi::IsValid(lib.index()));
     const Array& loaded_scripts = Array::Handle(lib.LoadedScripts());
     ASSERT(!loaded_scripts.IsNull());
     intptr_t num_scripts = loaded_scripts.Length();
     for (intptr_t i = 0; i < num_scripts; i++) {
       script ^= loaded_scripts.At(i);
       ASSERT(!script.IsNull());
       url ^= script.url();
       if (url.Equals(requested_url)) {
-        script.PrintToJSONStream(js, false);
+        script.PrintJSON(js, false);
         return true;
       }
     }
   }
   PrintErrorWithKind(js, "NotFoundError", "Cannot find script %s",
                      requested_url.ToCString());
   return true;
 }
 
 
@@ skipping 26 matching lines @@
       isolate->debugger()->PrintBreakpointsToJSONArray(&jsarr);
       return true;
     } else if (js->num_arguments() == 3) {
       // Print individual breakpoint.
       intptr_t id = 0;
       SourceBreakpoint* bpt = NULL;
       if (GetIntegerId(js->GetArgument(2), &id)) {
         bpt = isolate->debugger()->GetBreakpointById(id);
       }
       if (bpt != NULL) {
-        bpt->PrintToJSONStream(js);
+        bpt->PrintJSON(js);
         return true;
       } else {
         PrintError(js, "Unrecognized breakpoint id %s", js->GetArgument(2));
         return true;
       }
     } else {
       PrintError(js, "Command too long");
       return true;
     }
   } else {
     PrintError(js, "Unrecognized subcommand '%s'", js->GetArgument(1));
     return true;
   }
 }
 
 
 static bool HandleNullCode(uintptr_t pc, JSONStream* js) {
   // TODO(turnidge): Consider adding/using Object::null_code() for
   // consistent "type".
-  Object::null_object().PrintToJSONStream(js, false);
+  Object::null_object().PrintJSON(js, false);
   return true;
 }
 
 
 static bool HandleCode(Isolate* isolate, JSONStream* js) {
   REQUIRE_COLLECTION_ID("code");
   uword pc;
   if (js->num_arguments() > 2) {
     PrintError(js, "Command too long");
     return true;
@@ skipping 31 matching lines @@
     }
     return HandleNullCode(pc, js);
   }
   int64_t timestamp = 0;
   if (!GetCodeId(command, &timestamp, &pc) || (timestamp < 0)) {
     PrintError(js, "Malformed code id: %s", command);
     return true;
   }
   Code& code = Code::Handle(Code::FindCode(pc, timestamp));
   if (!code.IsNull()) {
-    code.PrintToJSONStream(js, false);
+    code.PrintJSON(js, false);
     return true;
   }
   PrintError(js, "Could not find code with id: %s", command);
   return true;
 }
 
 
 static bool HandleProfile(Isolate* isolate, JSONStream* js) {
   if (js->num_arguments() == 2) {
     const char* sub_command = js->GetArgument(1);
@@ skipping 24 matching lines @@
       tag_order = Profiler::kUser;
     } else if (js->OptionIs("tags", "vu")) {
       tag_order = Profiler::kVMUser;
     } else if (js->OptionIs("tags", "v")) {
       tag_order = Profiler::kVM;
     } else {
       PrintError(js, "Invalid tags option value: %s\n", tags_option);
       return true;
     }
   }
-  Profiler::PrintToJSONStream(isolate, js, full_profile, tag_order);
+  Profiler::PrintJSON(isolate, js, full_profile, tag_order);
   return true;
 }
 
 static bool HandleCoverage(Isolate* isolate, JSONStream* js) {
-  CodeCoverage::PrintToJSONStream(isolate, js);
+  CodeCoverage::PrintJSON(isolate, js);
   return true;
 }
 
 
 static bool HandleAllocationProfile(Isolate* isolate, JSONStream* js) {
   bool should_reset_accumulator = false;
   bool should_collect = false;
   if (js->num_arguments() != 1) {
     PrintError(js, "Command too long");
     return true;
@@ skipping 14 matching lines @@
       PrintError(js, "Unrecognized gc option '%s'", js->LookupOption("gc"));
       return true;
     }
   }
   if (should_reset_accumulator) {
     isolate->class_table()->ResetAllocationAccumulators();
   }
   if (should_collect) {
     isolate->heap()->CollectAllGarbage();
   }
-  isolate->class_table()->AllocationProfilePrintToJSONStream(js);
+  isolate->class_table()->AllocationProfilePrintJSON(js);
   return true;
 }
 
 
 static bool HandleResume(Isolate* isolate, JSONStream* js) {
   if (isolate->message_handler()->pause_on_start()) {
     isolate->message_handler()->set_pause_on_start(false);
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "Success");
     jsobj.AddProperty("id", "");
@@ skipping 52 matching lines @@
     // Note that the table index of the canonical type arguments will change
     // when the table grows. Should we not support this access at all?
     PrintError(js, "Must specify collection object id: /typearguments/id");
     return true;
   }
   if ((id < 0) || (id >= table_size) || (table.At(id) == Object::null())) {
     PrintError(js, "%" Pd " is not a valid typearguments id.", id);
     return true;
   }
   type_args ^= table.At(id);
-  type_args.PrintToJSONStream(js, false);
+  type_args.PrintJSON(js, false);
   return true;
 }
 
 
 static bool HandleHeapMap(Isolate* isolate, JSONStream* js) {
   isolate->heap()->PrintHeapMapToJSONStream(isolate, js);
   return true;
 }
 
 
@@ skipping 26 matching lines @@
     static const uword kExampleAddr = static_cast<uword>(kIntptrMax / 7);
     PrintError(js, "Must specify address: address/" Px ".", kExampleAddr);
     return true;
   }
   Object& object = Object::Handle(isolate);
   {
     NoGCScope no_gc;
     ContainsAddressVisitor visitor(isolate, addr);
     object = isolate->heap()->FindObject(&visitor);
   }
-  object.PrintToJSONStream(js, true);
+  object.PrintJSON(js, true);
   return true;
 }
 
 
 static bool HandleMalformedJson(Isolate* isolate, JSONStream* js) {
   JSONObject jsobj(js);
   jsobj.AddProperty("a", "a");
   JSONObject jsobj1(js);
   jsobj1.AddProperty("a", "a");
   JSONObject jsobj2(js);
@@ skipping 283 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart