Support Types in instance-ref/instance-view

runtime/vm/service.cc

 // Copyright (c) 2013, 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 "vm/service.h"
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 780 matching lines @@
   // Skip the dash.
   s++;
   // Extract the PC.
   if (!GetUnsignedIntegerId(s, address, 16)) {
     return false;
   }
   return true;
 }
 
 
+static bool HandleInstanceCommands(Isolate* isolate,
+                                   const Object& obj,
+                                   JSONStream* js,
+                                   intptr_t arg_pos) {
+  ASSERT(js->num_arguments() > arg_pos);
+  const char* action = js->GetArgument(arg_pos);
+  if (strcmp(action, "eval") == 0) {
+    if (js->num_arguments() > (arg_pos + 1)) {
+      PrintError(js, "expected at most %" Pd " arguments but found %" Pd "\n",
+                 arg_pos + 1,
+                 js->num_arguments());
+      return true;
+    }
+    if (obj.IsNull()) {
+      PrintErrorWithKind(js, "EvalCollected",
+                         "attempt to evaluate against collected object\n",
+                         js->num_arguments());
+      return true;
+    }
+    if (obj.raw() == Object::sentinel().raw()) {
+      PrintErrorWithKind(js, "EvalExpired",
+                         "attempt to evaluate against expired object\n",
+                         js->num_arguments());
+      return true;
+    }
+    const char* expr = js->LookupOption("expr");
+    if (expr == NULL) {
+      PrintError(js, "eval expects an 'expr' option\n",
+                 js->num_arguments());
+      return true;
+    }
+    const String& expr_str = String::Handle(isolate, String::New(expr));
+    ASSERT(obj.IsInstance());
+    const Instance& instance = Instance::Cast(obj);
+    const Object& result = Object::Handle(instance.Evaluate(expr_str));
+    if (result.IsNull()) {
+      Object::null_instance().PrintToJSONStream(js, true);
+    } else {
+      result.PrintToJSONStream(js, true);
+    }
+    return true;
+  }
+
+  PrintError(js, "unrecognized action '%s'\n", action);
+  return true;
+}
+
+
 static bool HandleClassesClosures(Isolate* isolate, const Class& cls,
                                   JSONStream* js) {
   intptr_t id;
   if (js->num_arguments() > 4) {
     PrintError(js, "Command too long");
     return true;
   }
   if (!GetIntegerId(js->GetArgument(3), &id)) {
     PrintError(js, "Must specify collection object id: closures/id");
     return true;
@@ skipping 126 matching lines @@
     jsobj.AddProperty("type", "TypeList");
     JSONArray members(&jsobj, "members");
     const intptr_t num_types = cls.NumCanonicalTypes();
     Type& type = Type::Handle();
     for (intptr_t i = 0; i < num_types; i++) {
       type = cls.CanonicalTypeFromIndex(i);
       members.AddValue(type);
     }
     return true;
   }
+  ASSERT(js->num_arguments() >= 4);
   intptr_t id;
-  if (js->num_arguments() > 4) {
-    PrintError(js, "Command too long");
-    return true;
-  }
   if (!GetIntegerId(js->GetArgument(3), &id)) {
     PrintError(js, "Must specify collection object id: types/id");
     return true;
   }
   Type& type = Type::Handle();
   type ^= cls.CanonicalTypeFromIndex(id);
   if (type.IsNull()) {
     PrintError(js, "Canonical type %" Pd " not found", id);
     return true;
   }
-  type.PrintToJSONStream(js, false);
-  return true;
+  if (js->num_arguments() == 4) {
+    type.PrintToJSONStream(js, false);
+    return true;
+  }
+  return HandleInstanceCommands(isolate, type, js, 4);
 }
 
 
 static bool HandleClasses(Isolate* isolate, JSONStream* js) {
   if (js->num_arguments() == 1) {
     ClassTable* table = isolate->class_table();
     JSONObject jsobj(js);
     table->PrintToJSONObject(&jsobj);
     return true;
   }
@@ skipping 200 matching lines @@
   }
 
   // Lookup the object.
   Object& obj = Object::Handle(isolate);
   bool error = false;
   obj = LookupObjectId(isolate, arg, &error);
   if (error) {
     PrintError(js, "unrecognized object id '%s'", arg);
     return true;
   }
-
-  // Now what should we do with the object?
   if (js->num_arguments() == 2) {
     // Print.
     if (obj.IsNull()) {
       // The object has been collected by the gc.
       PrintPseudoNull(js, "objects/collected", "<collected>");
       return true;
     } else if (obj.raw() == Object::sentinel().raw()) {
       // The object id has expired.
       PrintPseudoNull(js, "objects/expired", "<expired>");
       return true;
     }
     obj.PrintToJSONStream(js, false);
     return true;
   }
-  ASSERT(js->num_arguments() > 2);
-
-  const char* action = js->GetArgument(2);
-  if (strcmp(action, "eval") == 0) {
-    if (js->num_arguments() > 3) {
-      PrintError(js, "expected at most 3 arguments but found %" Pd "\n",
-                 js->num_arguments());
-      return true;
-    }
-    if (obj.IsNull()) {
-      PrintErrorWithKind(js, "EvalCollected",
-                         "attempt to evaluate against collected object\n",
-                         js->num_arguments());
-      return true;
-    }
-    if (obj.raw() == Object::sentinel().raw()) {
-      PrintErrorWithKind(js, "EvalExpired",
-                         "attempt to evaluate against expired object\n",
-                         js->num_arguments());
-      return true;
-    }
-    const char* expr = js->LookupOption("expr");
-    if (expr == NULL) {
-      PrintError(js, "eval expects an 'expr' option\n",
-                 js->num_arguments());
-      return true;
-    }
-    const String& expr_str = String::Handle(isolate, String::New(expr));
-    ASSERT(obj.IsInstance());
-    const Instance& instance = Instance::Cast(obj);
-    const Object& result = Object::Handle(instance.Evaluate(expr_str));
-    if (result.IsNull()) {
-      Object::null_instance().PrintToJSONStream(js, true);
-    } else {
-      result.PrintToJSONStream(js, true);
-    }
-    return true;
-  }
-
-  PrintError(js, "unrecognized action '%s'\n", action);
-  return true;
+  return HandleInstanceCommands(isolate, obj, js, 2);
 }
 
 
 static bool HandleScriptsEnumerate(Isolate* isolate, JSONStream* js) {
   JSONObject jsobj(js);
   jsobj.AddProperty("type", "ScriptList");
   JSONArray members(&jsobj, "members");
   const GrowableObjectArray& libs =
       GrowableObjectArray::Handle(isolate->object_store()->libraries());
   int num_libs = libs.Length();
@@ skipping 629 matching lines @@
   while (current != NULL) {
     if (strcmp(name, current->name()) == 0) {
       return current;
     }
     current = current->next();
   }
   return NULL;
 }
 
 }  // namespace dart