Restore missing properties

runtime/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;
 
 // Some value smaller than the object ring, so requesting a large array
 // doesn't result in an expired ref because the elements lapped it in the
 // object ring.
 const int kDefaultFieldLimit = 100;
@@ skipping 238 matching lines @@
             break;
           case 'ObjectPool':
             obj = new ObjectPool._empty(owner);
             break;
           case 'PcDescriptors':
             obj = new PcDescriptors._empty(owner);
             break;
           case 'TokenStream':
             obj = new TokenStream._empty(owner);
             break;
-          default:
-            obj = new UnknownObject._empty(owner);
         }
         break;
       case 'Event':
         obj = new ServiceEvent._empty(owner);
         break;
       case 'Script':
         obj = new Script._empty(owner);
         break;
       case 'Socket':
         obj = new Socket._empty(owner);
@@ skipping 1523 matching lines @@
     fields.clear();
     map['fields'].forEach((key, value) {
       fields.add(new NamedField(key, value));
     });
     _loaded = true;
   }
 }
 
 
 /// A [ServiceObject] which implements [ObservableMap].
-class ServiceMap extends ServiceObject implements ObservableMap {
+class ServiceMap extends ServiceObject implements ObservableMap,
+                                                  M.UnknownObjectRef  {
   final ObservableMap _map = new ObservableMap();
   static String objectIdRingPrefix = 'objects/';
 
   bool get immutable => false;
 
   ServiceMap._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   void _update(ObservableMap map, bool mapIsRef) {
     _loaded = !mapIsRef;
 
@@ skipping 712 matching lines @@
   @observable ServiceObject typeArguments;
   @observable int parameterIndex;
   @observable Instance targetType;
   @observable Instance bound;
 
   @observable Iterable<BoundField> fields;
   @observable var nativeFields;
   @observable Iterable<Guarded<ServiceObject>> elements;  // If a List.
   @observable Iterable<MapAssociation> associations;  // If a Map.
   @observable Iterable<dynamic> typedElements;  // If a TypedData.
-  @observable Instance referent;  // If a MirrorReference.
+  @observable ServiceObject referent;  // If a MirrorReference.
   @observable Instance key;  // If a WeakProperty.
   @observable Instance value;  // If a WeakProperty.
   @observable Breakpoint activationBreakpoint;  // If a Closure.
   @observable ServiceFunction oneByteFunction;  // If a RegExp.
   @observable ServiceFunction twoByteFunction;  // If a RegExp.
   @observable ServiceFunction externalOneByteFunction;  // If a RegExp.
   @observable ServiceFunction externalTwoByteFunction;  // If a RegExp.
   @observable Instance oneByteBytecode;  // If a RegExp.
   @observable Instance twoByteBytecode;  // If a RegExp.
   @observable bool isCaseSensitive;  // If a RegExp.
   @observable bool isMultiLine;  // If a RegExp.
 
+  bool get isAbstractType {
+    return (kind == M.InstanceKind.type ||
+            kind == M.InstanceKind.typeRef ||
+            kind == M.InstanceKind.typeParameter ||
+            kind == M.InstanceKind.boundedType);
+  }
+  bool get isNull => kind == M.InstanceKind.vNull;
+  bool get isBool => kind == M.InstanceKind.bool;
+  bool get isDouble => kind == M.InstanceKind.double;
+  bool get isString => kind == M.InstanceKind.string;
+  bool get isInt => kind == M.InstanceKind.int;
+  bool get isList => kind == M.InstanceKind.list;
+  bool get isMap => kind == M.InstanceKind.map;
+  bool get isTypedData {
+    return M.isTypedData(kind);
+  }
+  bool get isSimdValue {
+    return M.isSimdValue(kind);
+  }
+  bool get isRegExp => kind == M.InstanceKind.regExp;
+  bool get isMirrorReference => kind == M.InstanceKind.mirrorReference;
+  bool get isWeakProperty => kind == M.InstanceKind.weakProperty;
+  bool get isClosure => kind == M.InstanceKind.closure;
+  bool get isStackTrace => kind == M.InstanceKind.stackTrace;
   bool get isStackOverflowError {
     if (clazz == null) {
       return false;
     }
     if (clazz.library == null) {
       return false;
     }
     return (clazz.name == 'StackOverflowError') && clazz.library.isDart('core');
   }
 
@@ skipping 1015 matching lines @@
     super._update(map, mapIsRef);
 
     code = map['_code'];
     if (mapIsRef) {
       return;
     }
     objectPool = map['_objectPool'];
   }
 }
 
-class UnknownObject extends HeapObject implements M.UnknownObjectRef {
-  bool get immutable => true;
-
-  UnknownObject._empty(ServiceObjectOwner owner) : super._empty(owner);
-
-  void _update(ObservableMap map, bool mapIsRef) {
-    _upgradeCollection(map, isolate);
-    super._update(map, mapIsRef);
-
-    if (mapIsRef) {
-      return;
-    }
-  }
-}
-
 class TokenStream extends HeapObject implements M.TokenStreamRef {
   bool get immutable => true;
 
   @observable String privateKey;
 
   TokenStream._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   void _update(ObservableMap map, bool mapIsRef) {
     _upgradeCollection(map, isolate);
     super._update(map, mapIsRef);
@@ skipping 639 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);
     }
   }
 }