Simplify various name flavors in VM.

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/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 4204 matching lines @@
   {
     JSONStream js;
     const Integer& smi = Integer::Handle(Integer::New(7));
     smi.PrintJSON(&js, true);
     ElideJSONSubstring("classes", js.ToCString(), buffer);
     ElideJSONSubstring("_Smi@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Smi\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
-        "\"name\":\"_Smi\","
+        "\"name\":\"int\","
         "\"_vmName\":\"\"},"
         "\"kind\":\"Int\","
         "\"fixedId\":true,"
         "\"id\":\"objects\\/int-7\",\"valueAsString\":\"7\"}",
         buffer);
   }
   // Mint reference
   {
     JSONStream js;
     const Integer& smi = Integer::Handle(Integer::New(Mint::kMinValue));
     smi.PrintJSON(&js, true);
     ElideJSONSubstring("classes", js.ToCString(), buffer);
     ElideJSONSubstring("objects", buffer, buffer);
     ElideJSONSubstring("_Mint@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Mint\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
-        "\"name\":\"_Mint\",\"_vmName\":\"\"},"
+        "\"name\":\"int\",\"_vmName\":\"\"},"
         "\"kind\":\"Int\","
         "\"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);
     ElideJSONSubstring("classes", js.ToCString(), buffer);
     ElideJSONSubstring("objects", buffer, buffer);
     ElideJSONSubstring("_Bigint@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Bigint\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
-        "\"name\":\"_Bigint\",\"_vmName\":\"\"},"
+        "\"name\":\"int\",\"_vmName\":\"\"},"
         "\"kind\":\"Int\","
         "\"id\":\"\",\"valueAsString\":\"44444444444444444444444444444444\"}",
         buffer);
   }
   // Double reference
   {
     JSONStream js;
     const Double& dub = Double::Handle(Double::New(0.1234));
     dub.PrintJSON(&js, true);
     ElideJSONSubstring("classes", js.ToCString(), buffer);
     ElideJSONSubstring("objects", buffer, buffer);
     ElideJSONSubstring("_Double@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Double\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
-        "\"name\":\"_Double\",\"_vmName\":\"\"},"
+        "\"name\":\"double\",\"_vmName\":\"\"},"
         "\"kind\":\"Double\","
         "\"id\":\"\",\"valueAsString\":\"0.1234\"}",
         buffer);
   }
   // String reference
   {
     JSONStream js;
     const String& str = String::Handle(String::New("dw"));
     str.PrintJSON(&js, true);
     ElideJSONSubstring("classes", js.ToCString(), buffer);
     ElideJSONSubstring("objects", buffer, buffer);
     ElideJSONSubstring("_OneByteString@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"String\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
-        "\"name\":\"_OneByteString\",\"_vmName\":\"\"},"
+        "\"name\":\"String\",\"_vmName\":\"\"},"
         "\"kind\":\"String\","
         "\"id\":\"\",\"length\":2,\"valueAsString\":\"dw\"}",
         buffer);
   }
   // Array reference
   {
     JSONStream js;
     const Array& array = Array::Handle(Array::New(0));
     array.PrintJSON(&js, true);
     ElideJSONSubstring("classes", js.ToCString(), buffer);
     ElideJSONSubstring("objects", buffer, buffer);
     ElideJSONSubstring("_List@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"Array\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
-        "\"name\":\"_List\",\"_vmName\":\"\"},"
+        "\"name\":\"List\",\"_vmName\":\"\"},"
         "\"kind\":\"List\","
         "\"id\":\"\",\"length\":0}",
         buffer);
   }
   // GrowableObjectArray reference
   {
     JSONStream js;
     const GrowableObjectArray& array =
         GrowableObjectArray::Handle(GrowableObjectArray::New());
     array.PrintJSON(&js, true);
     ElideJSONSubstring("classes", js.ToCString(), buffer);
     ElideJSONSubstring("objects", buffer, buffer);
     ElideJSONSubstring("_GrowableList@", buffer, buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Instance\","
         "\"_vmType\":\"GrowableObjectArray\","
         "\"class\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
-        "\"name\":\"_GrowableList\","
+        "\"name\":\"List\","
         "\"_vmName\":\"\"},"
         "\"kind\":\"List\","
         "\"id\":\"\",\"length\":0}",
         buffer);
   }
   // LinkedHashMap reference
   {
     JSONStream js;
     const LinkedHashMap& array =
         LinkedHashMap::Handle(LinkedHashMap::NewDefault());
@@ skipping 342 matching lines @@
   }
 }
 
 
 struct TestResult {
   const char* in;
   const char* out;
 };
 
 
-VM_TEST_CASE(String_IdentifierPrettyName) {
+VM_TEST_CASE(String_ScrubName) {
   TestResult tests[] = {
     {"(dynamic, dynamic) => void", "(dynamic, dynamic) => void"},
     {"_List@915557746", "_List"},
     {"_HashMap@600006304<K, V>(dynamic) => V", "_HashMap<K, V>(dynamic) => V"},
     {"set:foo", "foo="},
     {"get:foo", "foo"},
     {"_ReceivePortImpl@709387912", "_ReceivePortImpl"},
     {"_ReceivePortImpl@709387912._internal@709387912",
         "_ReceivePortImpl._internal"},
     {"_C@6328321&_E@6328321&_F@6328321", "_C&_E&_F"},
     {"List.", "List"},
     {"get:foo@6328321", "foo"},
     {"_MyClass@6328321.", "_MyClass"},
     {"_MyClass@6328321.named", "_MyClass.named"},
   };
   String& test = String::Handle();
   String& result = String::Handle();
   for (size_t i = 0; i < ARRAY_SIZE(tests); i++) {
     test = String::New(tests[i].in);
-    result = String::IdentifierPrettyName(test);
+    result = String::ScrubName(test);
     EXPECT_STREQ(tests[i].out, result.ToCString());
   }
 }
 
 }  // namespace dart