Standardize on using "kind" to distinguish sub-varieties of a type.

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 745 matching lines @@
 }
 
 
 void Service::SendEchoEvent(Isolate* isolate, const char* text) {
   JSONStream js;
   {
     JSONObject jsobj(&js);
     {
       JSONObject event(&jsobj, "event");
       event.AddProperty("type", "Event");
-      event.AddProperty("eventType", "_Echo");
+      event.AddProperty("kind", "_Echo");
       event.AddProperty("isolate", isolate);
       if (text != NULL) {
         event.AddProperty("text", text);
       }
     }
   }
   const String& message = String::Handle(String::New(js.ToCString()));
   uint8_t data[] = {0, 128, 255};
   SendEvent(message, data, sizeof(data));
 }
@@ skipping 67 matching lines @@
     }
     const Integer& obj =
         Integer::Handle(isolate, Smi::New(static_cast<intptr_t>(value)));
     return obj.raw();
   } else if (strcmp(arg, "bool-true") == 0) {
     return Bool::True().raw();
   } else if (strcmp(arg, "bool-false") == 0) {
     return Bool::False().raw();
   } else if (strcmp(arg, "null") == 0) {
     return Object::null();
-  } else if (strcmp(arg, "not-initialized") == 0) {
-    return Object::sentinel().raw();
-  } else if (strcmp(arg, "being-initialized") == 0) {
-    return Object::transition_sentinel().raw();
   }
 
   ObjectIdRing* ring = isolate->object_id_ring();
   ASSERT(ring != NULL);
   intptr_t id = -1;
   if (!GetIntegerId(arg, &id)) {
     *kind = ObjectIdRing::kInvalid;
     return Object::null();
   }
   return ring->GetObjectForId(id, kind);
@@ skipping 1008 matching lines @@
 
 
 static bool RemoveBreakpoint(Isolate* isolate, JSONStream* js) {
   if (!js->HasParam("breakpointId")) {
     PrintMissingParamError(js, "breakpointId");
     return true;
   }
   const char* bpt_id = js->LookupParam("breakpointId");
   Breakpoint* bpt = LookupBreakpoint(isolate, bpt_id);
   if (bpt == NULL) {
-    fprintf(stderr, "ERROR1");
     PrintInvalidParamError(js, "breakpointId");
     return true;
   }
   isolate->debugger()->RemoveBreakpoint(bpt->id());
 
   // TODO(turnidge): Consider whether the 'Success' type is proper.
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "Success");
   return true;
 }
@@ skipping 384 matching lines @@
   const intptr_t kChunkSize = 1 * MB;
   intptr_t num_chunks =
       (stream.bytes_written() + (kChunkSize - 1)) / kChunkSize;
   for (intptr_t i = 0; i < num_chunks; i++) {
     JSONStream js;
     {
       JSONObject jsobj(&js);
       {
         JSONObject event(&jsobj, "event");
         event.AddProperty("type", "Event");
-        event.AddProperty("eventType", "_Graph");
+        event.AddProperty("kind", "_Graph");
         event.AddProperty("isolate", isolate);
 
         event.AddProperty("chunkIndex", i);
         event.AddProperty("chunkCount", num_chunks);
         event.AddProperty("nodeCount", node_count);
       }
       jsobj.AddProperty("streamId", "_Graph");
     }
 
     const String& message = String::Handle(String::New(js.ToCString()));
@@ skipping 388 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart