A round of edits to make mirrors.dart more like our current working

runtime/lib/mirrors.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 "vm/bootstrap_natives.h"
 
 #include "platform/json.h"
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
 #include "vm/dart_entry.h"
@@ skipping 38 matching lines @@
   return Dart_New(cls, Dart_Null(), 0, NULL);
 }
 
 
 static Dart_Handle MapAdd(Dart_Handle map, Dart_Handle key, Dart_Handle value) {
   Dart_Handle args[] = { key, value };
   return Dart_Invoke(map, Dart_NewString("[]="), ARRAY_SIZE(args), args);
 }
 
 
-static Dart_Handle MapGet(Dart_Handle map, Dart_Handle key) {
-  Dart_Handle args[] = { key };
-  return Dart_Invoke(map, Dart_NewString("[]"), ARRAY_SIZE(args), args);
-}
-
-
 static Dart_Handle MirrorLib() {
   Dart_Handle mirror_lib_name = Dart_NewString("dart:mirrors");
   return Dart_LookupLibrary(mirror_lib_name);
 }
 
 
 static Dart_Handle IsMirror(Dart_Handle object, bool* is_mirror) {
   Dart_Handle cls_name = Dart_NewString("Mirror");
   Dart_Handle cls = Dart_GetClass(MirrorLib(), cls_name);
   if (Dart_IsError(cls)) {
@@ skipping 130 matching lines @@
   if (Dart_IsNull(target)) {
     return target;
   }
   if (Dart_IsLibrary(target)) {
     Dart_Handle cls_name = Dart_NewString("_LazyLibraryMirror");
     Dart_Handle cls = Dart_GetClass(MirrorLib(), cls_name);
     Dart_Handle args[] = { Dart_LibraryName(target) };
     return Dart_New(cls, Dart_Null(), ARRAY_SIZE(args), args);
   } else {
     ASSERT(Dart_IsClass(target) || Dart_IsInterface(target));
-    Dart_Handle cls_name = Dart_NewString("_LazyInterfaceMirror");
+    Dart_Handle cls_name = Dart_NewString("_LazyClassMirror");
     Dart_Handle cls = Dart_GetClass(MirrorLib(), cls_name);
 
     Dart_Handle lib = Dart_ClassGetLibrary(target);
     Dart_Handle lib_name;
     if (Dart_IsNull(lib)) {
       lib_name = Dart_Null();
     } else {
       lib_name = Dart_LibraryName(lib);
     }
 
@@ skipping 29 matching lines @@
       return result;
     }
   }
   return mirror_list;
 }
 
 
 static Dart_Handle CreateMemberMap(Dart_Handle owner);
 
 
-static Dart_Handle CreateInterfaceMirror(Dart_Handle intf,
-                                         Dart_Handle intf_name,
-                                         Dart_Handle lib,
-                                         Dart_Handle lib_mirror) {
+static Dart_Handle CreateClassMirror(Dart_Handle intf,
+                                     Dart_Handle intf_name,
+                                     Dart_Handle lib,
+                                     Dart_Handle lib_mirror) {
   ASSERT(Dart_IsClass(intf) || Dart_IsInterface(intf));
-  Dart_Handle cls_name = Dart_NewString("_LocalInterfaceMirrorImpl");
+  Dart_Handle cls_name = Dart_NewString("_LocalClassMirrorImpl");
   Dart_Handle cls = Dart_GetClass(MirrorLib(), cls_name);
   if (Dart_IsError(cls)) {
     return cls;
   }
 
   // TODO(turnidge): Why am I getting Null when I expect Object?
   Dart_Handle super_class = Dart_GetSuperclass(intf);
   if (Dart_IsNull(super_class)) {
     super_class = Dart_GetClass(CoreLib(), Dart_NewString("Object"));
   }
@@ skipping 171 matching lines @@
   if (Dart_IsError(result)) {
     return result;
   }
   for (int i = 0; i < len; i++) {
     Dart_Handle intf_name = Dart_ListGetAt(names, i);
     Dart_Handle intf = Dart_GetClass(owner, intf_name);
     if (Dart_IsError(intf)) {
       return intf;
     }
     Dart_Handle intf_mirror =
-        CreateInterfaceMirror(intf, intf_name, owner, owner_mirror);
+        CreateClassMirror(intf, intf_name, owner, owner_mirror);
     if (Dart_IsError(intf_mirror)) {
       return intf_mirror;
     }
     result = MapAdd(map, intf_name, intf_mirror);
     if (Dart_IsError(result)) {
       return result;
     }
   }
   return Dart_True();
 }
@@ skipping 146 matching lines @@
   return map;
 }
 
 
 static Dart_Handle CreateIsolateMirror() {
   Dart_Handle cls_name = Dart_NewString("_LocalIsolateMirrorImpl");
   Dart_Handle cls = Dart_GetClass(MirrorLib(), cls_name);
   if (Dart_IsError(cls)) {
     return cls;
   }
-
-  Dart_Handle args[] = { Dart_DebugName() };
-  Dart_Handle mirror = Dart_New(cls, Dart_Null(), ARRAY_SIZE(args), args);
-  if (Dart_IsError(mirror)) {
-    return mirror;
-  }
-
-  return mirror;
+  Dart_Handle args[] = {
+    Dart_DebugName(),
+    CreateLazyMirror(Dart_RootLibrary()),
+  };
+  return Dart_New(cls, Dart_Null(), ARRAY_SIZE(args), args);
 }
 
 
 static Dart_Handle CreateMirrorSystem() {
   Dart_Handle cls_name = Dart_NewString("_LocalMirrorSystemImpl");
   Dart_Handle cls = Dart_GetClass(MirrorLib(), cls_name);
   if (Dart_IsError(cls)) {
     return cls;
   }
 
   Dart_Handle libraries = CreateLibrariesMap();
   if (Dart_IsError(libraries)) {
     return libraries;
   }
 
-  // Lookup the root_lib_mirror from the library list to canonicalize it.
-  Dart_Handle root_lib_name = Dart_LibraryName(Dart_RootLibrary());
-  Dart_Handle root_lib_mirror = MapGet(libraries, root_lib_name);
-  if (Dart_IsError(root_lib_mirror)) {
-    return root_lib_mirror;
-  }
-
   Dart_Handle args[] = {
-    root_lib_mirror,
     libraries,
     CreateIsolateMirror(),
   };
   Dart_Handle mirror = Dart_New(cls, Dart_Null(), ARRAY_SIZE(args), args);
   if (Dart_IsError(mirror)) {
     return mirror;
   }
 
   return mirror;
 }
@@ skipping 45 matching lines @@
   Dart_Handle mirror = Dart_New(cls, Dart_Null(), ARRAY_SIZE(args), args);
 
   if (is_closure) {
     // We set the function field of ClosureMirrors outside of the constructor
     // to break the mutual recursion.
     Dart_Handle func = Dart_ClosureFunction(instance);
     if (Dart_IsError(func)) {
       return func;
     }
     Dart_Handle func_name = Dart_NewString("call");
+    // TODO(turnidge): Passing in 'mirror' here as the method owner
+    // seems wrong to me.  Investigate.
     Dart_Handle func_mirror = CreateMethodMirror(func, func_name, mirror);
     if (Dart_IsError(func_mirror)) {
       return func_mirror;
     }
 
     Dart_Handle func_field_name = Dart_NewString("_function");
     Dart_Handle result = Dart_SetField(mirror, func_field_name, func_mirror);
     if (Dart_IsError(result)) {
       return result;
     }
@@ skipping 166 matching lines @@
   }
 
   Dart_Handle wrapped_result = CreateInstanceMirror(result);
   if (Dart_IsError(wrapped_result)) {
     Dart_PropagateError(wrapped_result);
   }
   Dart_SetReturnValue(args, wrapped_result);
 }
 
 
-void NATIVE_ENTRY_FUNCTION(LocalInterfaceMirrorImpl_invokeConstructor)(
+void NATIVE_ENTRY_FUNCTION(LocalClassMirrorImpl_invokeConstructor)(
     Dart_NativeArguments args) {
   Dart_Handle klass_mirror = Dart_GetNativeArgument(args, 0);
   Dart_Handle constructor_name = Dart_GetNativeArgument(args, 1);
   // The wrapped arguments are either simple values or instance mirrors.
   Dart_Handle wrapped_invoke_args = Dart_GetNativeArgument(args, 2);
 
   Dart_Handle klass = UnwrapMirror(klass_mirror);
   GrowableArray<Dart_Handle> invoke_args;
   Dart_Handle result = UnwrapArgList(wrapped_invoke_args, &invoke_args);
   if (Dart_IsError(result)) {
@@ skipping 17 matching lines @@
 }
 
 
 void HandleMirrorsMessage(Isolate* isolate,
                           Dart_Port reply_port,
                           const Instance& message) {
   UNIMPLEMENTED();
 }
 
 }  // namespace dart