Revert "Give instances their own model class; move DartErrors out of instance-ref into their own er…

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 16 matching lines @@
   @reflectable Isolate get isolate => _owner.isolate;
 
   /// The id of this object.
   @reflectable String get id => _id;
   String _id;
 
   /// The service type of this object.
   @reflectable String get serviceType => _serviceType;
   String _serviceType;
 
-  bool get isBool => serviceType == 'Bool';
-  bool get isDouble => serviceType == 'Double';
-  bool get isError => serviceType == 'Error';
-  bool get isInstance => serviceType == 'Instance';
-  bool get isInt => serviceType == 'Smi' || serviceType == 'Mint' || serviceType == 'Bigint';
-  bool get isList => serviceType == 'GrowableObjectArray' || serviceType == 'Array';
-  bool get isNull => serviceType == 'Null';
-  bool get isSentinel => serviceType == 'Sentinel';
-  bool get isString => serviceType == 'String';
-  bool get isType => serviceType == 'Type';
-
   /// 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.
 
   /// Is this object cacheable?  That is, is it impossible for the [id]
@@ skipping 34 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 'Null':
-      case 'Sentinel':  // TODO(rmacnak): Separate this out.
-      case 'Smi':
-      case 'String':
-      case 'Type':
-        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':
@@ skipping 1051 matching lines @@
 
   String toString() => "ServiceMap($_map)";
 }
 
 /// A [DartError] is peered to a Dart Error object.
 class DartError extends ServiceObject {
   DartError._empty(ServiceObject owner) : super._empty(owner);
 
   @observable String kind;
   @observable String message;
-  @observable Instance exception;
+  @observable ServiceMap exception;
   @observable ServiceMap stacktrace;
 
   void _update(ObservableMap map, bool mapIsRef) {
     kind = map['kind'];
     message = map['message'];
     exception = new ServiceObject._fromMap(owner, map['exception']);
     stacktrace = new ServiceObject._fromMap(owner, map['stacktrace']);
     name = 'DartError $kind';
     vmName = name;
   }
@@ skipping 259 matching lines @@
     subclasses.sort(ServiceObject.LexicalSortName);
   }
 
   Future<ServiceObject> get(String command) {
     return isolate.get(id + "/$command");
   }
 
   String toString() => 'Class($vmName)';
 }
 
-class Instance extends ServiceObject {
-  @observable Class clazz;
-  @observable String valueAsString;
-  @observable int size;
-  @observable ServiceFunction closureFunc;  // If a closure.
-  @observable String name;  // If a Type.
-
-  @observable var typeClass;
-  @observable var length;
-  @observable var fields;
-  @observable var nativeFields;
-  @observable var elements;
-  @observable var userName;
-
-  bool get isClosure => closureFunc != null;
-
-  Instance._empty(ServiceObjectOwner owner) : super._empty(owner);
-
-  void _update(ObservableMap map, bool mapIsRef) {
-    // Extract full properties.
-    _upgradeCollection(map, isolate);
-
-    clazz = map['class'];
-    valueAsString = map['valueAsString'];
-    size = map['size'];
-    closureFunc = map['closureFunc'];
-    name = map['name'];
-
-    if (mapIsRef) {
-      return;
-    }
-
-    nativeFields = map['nativeFields'];
-    fields = map['fields'];
-    length = map['length'];
-    elements = map['elements'];
-    typeClass = map['type_class'];
-    userName = map['user_name'];
-
-    // We are fully loaded.
-    _loaded = true;
-  }
-
-  String get shortName => valueAsString != null ? valueAsString : 'a ${clazz.name}';
-
-  String toString() => 'Instance($shortName)';
-}
-
 // TODO(koda): Sync this with VM.
 class FunctionKind {
   final String _strValue;
   FunctionKind._internal(this._strValue);
   toString() => _strValue;
   bool isFake() => [kCollected, kNative, kTag, kReused].contains(this);
 
   static FunctionKind fromJSON(String value) {
     switch(value) {
       case 'kRegularFunction': return kRegularFunction;
@@ skipping 897 matching lines @@
     for (var metric in metrics) {
       metric.reload().then((m) {
         m.addSample(new MetricSample(m.value));
       });
     }
   }
 }
 
 // Convert any ServiceMaps representing a null instance into an actual null.
 _convertNull(obj) {
-  if (obj.isNull) {
+  if (obj is ServiceMap &&
+      obj.serviceType == 'Null') {
     return null;
   }
   return obj;
 }
 
 // Returns true if [map] is a service map. i.e. it has the following keys:
 // 'id' and a 'type'.
 bool _isServiceMap(ObservableMap m) {
   return (m != null) && (m['id'] != null) && (m['type'] != null);
 }
@@ skipping 32 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);
     }
   }
 }