Rework how types work in the VM Service.

runtime/vm/object_test.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 "platform/globals.h"
 
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
@@ skipping 4275 matching lines @@
     EXPECT_STREQ(
         "{\"type\":\"@Library\",\"id\":\"\",\"name\":\"dart.core\","
         "\"url\":\"dart:core\"}",
         buffer);
   }
   // Bool reference
   {
     JSONStream js;
     Bool::True().PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
-    EXPECT_STREQ("{\"type\":\"@Bool\",\"id\":\"objects\\/bool-true\","
-                 "\"class\":{\"type\":\"@Class\",\"id\":\"\","
-                 "\"name\":\"bool\"},\"valueAsString\":\"true\"}",
-                 buffer);
+    EXPECT_STREQ(
+        "{\"type\":\"@bool\","
+        "\"class\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"bool\"},"
+        "\"id\":\"objects\\/bool-true\",\"valueAsString\":\"true\"}",
+        buffer);
   }
   // Smi reference
   {
     JSONStream js;
     const Integer& smi = Integer::Handle(Integer::New(7));
     smi.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("_Smi@", buffer, buffer);
     EXPECT_STREQ(
-        "{\"type\":\"@Smi\","
+        "{\"type\":\"@int\",\"_vmType\":\"@Smi\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"_Smi\","
-        "\"vmName\":\"\"},"
+        "\"_vmName\":\"\"},"
         "\"id\":\"objects\\/int-7\",\"valueAsString\":\"7\"}",
         buffer);
   }
   // Mint reference
   {
     JSONStream js;
     const Integer& smi = Integer::Handle(Integer::New(Mint::kMinValue));
     smi.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("objects", buffer, buffer);
     elideSubstring("_Mint@", buffer, buffer);
     EXPECT_STREQ(
-        "{\"type\":\"@Mint\","
+        "{\"type\":\"@int\",\"_vmType\":\"@Mint\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"_Mint\","
-        "\"vmName\":\"\"},"
+        "\"_vmName\":\"\"},"
         "\"id\":\"\",\"valueAsString\":\"-9223372036854775808\"}",
         buffer);
   }
   // Bigint reference
   {
     JSONStream js;
     const String& bigint_str =
         String::Handle(String::New("44444444444444444444444444444444"));
     const Integer& bigint = Integer::Handle(Integer::New(bigint_str));
     bigint.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("objects", buffer, buffer);
     elideSubstring("_Bigint@", buffer, buffer);
     EXPECT_STREQ(
-        "{\"type\":\"@Bigint\","
+        "{\"type\":\"@int\",\"_vmType\":\"@Bigint\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"_Bigint\","
-        "\"vmName\":\"\"},"
+        "\"_vmName\":\"\"},"
         "\"id\":\"\",\"valueAsString\":\"44444444444444444444444444444444\"}",
         buffer);
   }
   // Double reference
   {
     JSONStream js;
     const Double& dub = Double::Handle(Double::New(0.1234));
     dub.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("objects", buffer, buffer);
     elideSubstring("_Double@", buffer, buffer);
     EXPECT_STREQ(
-        "{\"type\":\"@Double\","
+        "{\"type\":\"@double\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"_Double\","
-        "\"vmName\":\"\"},"
+        "\"_vmName\":\"\"},"
         "\"id\":\"\",\"valueAsString\":\"0.1234\"}",
         buffer);
   }
   // String reference
   {
     JSONStream js;
     const String& str = String::Handle(String::New("dw"));
     str.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("objects", buffer, buffer);
     elideSubstring("_OneByteString@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@String\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\","
-        "\"name\":\"_OneByteString\",\"vmName\":\"\"},"
+        "\"name\":\"_OneByteString\",\"_vmName\":\"\"},"
         "\"id\":\"\",\"valueAsString\":\"\\\"dw\\\"\"}",
         buffer);
   }
   // Array reference
   {
     JSONStream js;
     const Array& array = Array::Handle(Array::New(0));
     array.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("objects", buffer, buffer);
     elideSubstring("_List@", buffer, buffer);
     EXPECT_STREQ(
-        "{\"type\":\"@Array\","
+        "{\"type\":\"@List\",\"_vmType\":\"@Array\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"_List\","
-        "\"vmName\":\"\"},"
+        "\"_vmName\":\"\"},"
         "\"id\":\"\",\"length\":0}",
         buffer);
   }
   // GrowableObjectArray reference
   {
     JSONStream js;
     const GrowableObjectArray& array =
         GrowableObjectArray::Handle(GrowableObjectArray::New());
     array.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("objects", buffer, buffer);
     elideSubstring("_GrowableList@", buffer, buffer);
     EXPECT_STREQ(
-        "{\"type\":\"@GrowableObjectArray\","
+        "{\"type\":\"@List\",\"_vmType\":\"@GrowableObjectArray\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"_GrowableList\","
-        "\"vmName\":\"\"},\"id\":\"\",\"length\":0}",
+        "\"_vmName\":\"\"},\"id\":\"\",\"length\":0}",
         buffer);
   }
   // LinkedHashMap reference
   {
     JSONStream js;
     const LinkedHashMap& array = LinkedHashMap::Handle(LinkedHashMap::New());
     array.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("objects", buffer, buffer);
     elideSubstring("_InternalLinkedHashMap@", buffer, buffer);
     EXPECT_STREQ(
-        "{\"type\":\"@LinkedHashMap\","
+        "{\"type\":\"@Instance\",\"_vmType\":\"@LinkedHashMap\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\","
-        "\"name\":\"_InternalLinkedHashMap\",\"vmName\":\"\"},\"id\":\"\"}",
+        "\"name\":\"_InternalLinkedHashMap\",\"_vmName\":\"\"},\"id\":\"\"}",
         buffer);
   }
   // UserTag reference
   {
     JSONStream js;
     Instance& tag = Instance::Handle(isolate->object_store()->default_tag());
     tag.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("objects", buffer, buffer);
     elideSubstring("_UserTag@", buffer, buffer);
     EXPECT_STREQ(
-        "{\"type\":\"@UserTag\","
+        "{\"type\":\"@Instance\",\"_vmType\":\"@UserTag\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"_UserTag\","
-        "\"vmName\":\"\"},"
+        "\"_vmName\":\"\"},"
         "\"id\":\"\"}",
         buffer);
   }
   // Type reference
   // TODO(turnidge): Add in all of the other Type siblings.
   {
     JSONStream js;
     Instance& type = Instance::Handle(isolate->object_store()->bool_type());
     type.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     elideSubstring("objects", buffer, buffer);
     elideSubstring("_Type@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Type\","
         "\"class\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"_Type\","
-        "\"vmName\":\"\"},\"id\":\"\","
+        "\"_vmName\":\"\"},\"id\":\"\","
         "\"typeClass\":{\"type\":\"@Class\",\"id\":\"\",\"name\":\"bool\"},"
         "\"name\":\"bool\"}",
         buffer);
   }
   // Null reference
   {
     JSONStream js;
     Object::null_object().PrintJSON(&js, true);
     EXPECT_STREQ(
-        "{\"type\":\"@Null\",\"id\":\"objects\\/null\","
+        "{\"type\":\"@null\",\"id\":\"objects\\/null\","
         "\"valueAsString\":\"null\"}",
         js.ToCString());
   }
   // Sentinel reference
   {
     JSONStream js;
     Object::sentinel().PrintJSON(&js, true);
     EXPECT_STREQ(
         "{\"type\":\"Sentinel\",\"id\":\"objects\\/not-initialized\","
         "\"valueAsString\":\"<not initialized>\"}",
@@ skipping 10 matching lines @@
   }
   // LiteralToken reference.  This is meant to be an example of a
   // "weird" type that isn't usually returned by the VM Service except
   // when we are doing direct heap inspection.
   {
     JSONStream js;
     LiteralToken& tok = LiteralToken::Handle(LiteralToken::New());
     tok.PrintJSON(&js, true);
     elideSubstring("objects", js.ToCString(), buffer);
     EXPECT_STREQ(
-        "{\"type\":\"@LiteralToken\",\"id\":\"\"}",
+        "{\"type\":\"@Object\",\"_vmType\":\"@LiteralToken\",\"id\":\"\"}",
         buffer);
   }
 }
 
 
 TEST_CASE(InstanceEquality) {
   // Test that Instance::OperatorEquals can call a user-defined operator==.
   const char* kScript =
       "class A {\n"
       "  bool operator==(A other) { return true; }\n"
@@ skipping 37 matching lines @@
   EXPECT_VALID(h_result);
   Integer& result = Integer::Handle();
   result ^= Api::UnwrapHandle(h_result);
   String& foo = String::Handle(String::New("foo"));
   Integer& expected = Integer::Handle();
   expected ^= foo.HashCode();
   EXPECT(result.IsIdenticalTo(expected));
 }
 
 }  // namespace dart