Rework how types work in the VM Service.

runtime/bin/vmservice/observatory/lib/src/service/object.dart

 // Copyright (c) 2014, 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.
 
 part of service;
 
 /// A [ServiceObject] is an object known to the VM service and is tied
 /// to an owning [Isolate].
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
@@ skipping 20 matching lines @@
   String _id;
 
   /// The user-level type of this object.
   @reflectable String get type => _type;
   String _type;
 
   /// The vm type of this object.
   @reflectable String get vmType => _vmType;
   String _vmType;
 
-  bool get isBool => vmType == 'Bool';
+  static bool _isInstanceType(String type) {
+    switch (type) {
+      case 'BoundedType':
+      case 'Instance':
+      case 'List':
+      case 'String':
+      case 'Type':
+      case 'TypeParameter':
+      case 'TypeRef':
+      case 'bool':
+      case 'double':
+      case 'int':
+      case 'null':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  static bool _isTypeType(String type) {
+    switch (type) {
+      case 'BoundedType':
+      case 'Type':
+      case 'TypeParameter':
+      case 'TypeRef':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  bool get isAbstractType => _isTypeType(type);
+  bool get isBool => type == 'bool';
+  bool get isContext => type == 'Context';
+  bool get isDouble => type == 'double';
+  bool get isError => type == 'Error';
+  bool get isInstance => _isInstanceType(type);
+  bool get isInt => type == 'int';
+  bool get isList => type == 'List';
+  bool get isNull => type == 'null';
+  bool get isSentinel => type == 'Sentinel';
+  bool get isString => type == 'String';
+
+  // Kinds of Instance.
+  bool get isMirrorReference => vmType == 'MirrorReference';
+  bool get isWeakProperty => vmType == 'WeakProperty';
   bool get isClosure => false;
-  bool get isContext => vmType == 'Context';
-  bool get isDouble => vmType == 'Double';
-  bool get isError => vmType == 'Error';
-  bool get isInstance => vmType == 'Instance';
-  bool get isInt => vmType == 'Smi' || vmType == 'Mint' || vmType == 'Bigint';
-  bool get isList => vmType == 'GrowableObjectArray' || vmType == 'Array';
-  bool get isMirrorReference => vmType == 'MirrorReference';
-  bool get isNull => vmType == 'Null';
-  bool get isSentinel => vmType == 'Sentinel';
-  bool get isString => vmType == 'String';
-  bool get isType => vmType == 'Type';
-  bool get isWeakProperty => vmType == 'WeakProperty';
 
   /// The complete service url of this object.
   @reflectable String get link => _owner.relativeLink(_id);
 
   /// Has this object been fully loaded?
   bool get loaded => _loaded;
   bool _loaded = false;
   // TODO(turnidge): Make loaded observable and get rid of loading
   // from Isolate.
 
@@ skipping 38 matching lines @@
         break;
       case 'Error':
         obj = new DartError._empty(owner);
         break;
       case 'Function':
         obj = new ServiceFunction._empty(owner);
         break;
       case 'Gauge':
         obj = new ServiceMetric._empty(owner);
         break;
-      case 'Array':
-      case 'Bigint':
-      case 'Bool':
-      case 'Double':
-      case 'GrowableObjectArray':
-      case 'Instance':
-      case 'Mint':
-      case 'MirrorReference':
-      case 'Null':
-      case 'Sentinel':  // TODO(rmacnak): Separate this out.
-      case 'Smi':
-      case 'String':
-      case 'Type':
-      case 'WeakProperty':
-        obj = new Instance._empty(owner);
-        break;
       case 'Isolate':
         obj = new Isolate._empty(owner.vm);
         break;
       case 'Library':
         obj = new Library._empty(owner);
         break;
       case 'ServiceError':
         obj = new ServiceError._empty(owner);
         break;
       case 'ServiceEvent':
         obj = new ServiceEvent._empty(owner);
         break;
       case 'ServiceException':
         obj = new ServiceException._empty(owner);
         break;
       case 'Script':
         obj = new Script._empty(owner);
         break;
       case 'Socket':
         obj = new Socket._empty(owner);
         break;
       default:
-        obj = new ServiceMap._empty(owner);
+        if (_isInstanceType(type) ||
+            type == 'Sentinel') {  // TODO(rmacnak): Separate this out.
+          obj = new Instance._empty(owner);
+          break;
+        } else {
+          obj = new ServiceMap._empty(owner);
+          break;
+        }
     }
     obj.update(map);
     return obj;
   }
 
   /// If [this] was created from a reference, load the full object
   /// from the service by calling [reload]. Else, return [this].
   Future<ServiceObject> load() {
     if (loaded) {
       return new Future.value(this);
@@ skipping 16 matching lines @@
       return new Future.value(this);
     }
     if (_inProgressReload == null) {
       _inProgressReload = vm.getAsMap(link).then((ObservableMap map) {
           var mapType = _stripRef(map['type']);
           if (mapType != _type) {
             // If the type changes, return a new object instead of
             // updating the existing one.
             //
             // TODO(turnidge): Check for vmType changing as well?
-            assert(mapType == 'Error' || mapType == 'Null');
+            assert(mapType == 'Error' || mapType == 'null');
             return new ServiceObject._fromMap(owner, map);
           }
           update(map);
           return this;
       }).whenComplete(() {
           // This reload is complete.
           _inProgressReload = null;
       });
     }
     return _inProgressReload;
@@ skipping 13 matching lines @@
       // It is only safe to change an id when the object isn't cacheable.
       assert(!canCache);
     }
     _id = map['id'];
 
     _type = mapType;
 
     // When the response specifies a specific vmType, use it.
     // Otherwise the vmType of the response is the same as the 'user'
     // type.
-    if (map.containsKey('vmType')) {
-      _vmType = _stripRef(map['vmType']);
+    if (map.containsKey('_vmType')) {
+      _vmType = _stripRef(map['_vmType']);
     } else {
       _vmType = _type;
     }
 
     _update(map, mapIsRef);
   }
 
   // Updates internal state from [map]. [map] can be a reference.
   void _update(ObservableMap map, bool mapIsRef);
 
@@ skipping 2296 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }