Added getField/setField to ObjectMirror. For InstanceMirrors, this get/sets

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 146 matching lines @@
 static Dart_Handle UnwrapMirror(Dart_Handle mirror) {
   Dart_Handle field_name = Dart_NewString("_reference");
   Dart_Handle vm_ref = Dart_GetField(mirror, field_name);
   if (Dart_IsError(vm_ref)) {
     return vm_ref;
   }
   return UnwrapVMReference(vm_ref);
 }
 
 
+static Dart_Handle UnwrapArg(Dart_Handle arg) {
+    if (Dart_IsError(arg)) {
+      return arg;
+    }
+    bool is_mirror = false;
+    Dart_Handle result = IsMirror(arg, &is_mirror);
+    if (Dart_IsError(result)) {
+      return result;
+    }
+    if (is_mirror) {
+      return UnwrapMirror(arg);
+    } else {
+      // Simple value.
+      ASSERT(IsSimpleValue(arg));
+      return arg;
+    }
+}
+
 static Dart_Handle UnwrapArgList(Dart_Handle arg_list,
                                  GrowableArray<Dart_Handle>* arg_array) {
   intptr_t len = 0;
   Dart_Handle result = Dart_ListLength(arg_list, &len);
   if (Dart_IsError(result)) {
     return result;
   }
   for (int i = 0; i < len; i++) {
     Dart_Handle arg = Dart_ListGetAt(arg_list, i);
-    if (Dart_IsError(arg)) {
-      return arg;
+    Dart_Handle unwrapped_arg = UnwrapArg(arg);
+    if (Dart_IsError(unwrapped_arg)) {
+      return unwrapped_arg;
     }
-    bool is_mirror = false;
-    result = IsMirror(arg, &is_mirror);
-    if (Dart_IsError(result)) {
-      return result;
-    }
-    if (is_mirror) {
-      arg_array->Add(UnwrapMirror(arg));
-    } else {
-      // Simple value.
-      ASSERT(IsSimpleValue(arg));
-      arg_array->Add(arg);
-    }
+    arg_array->Add(unwrapped_arg);
   }
   return Dart_True();
 }
 
 
 static Dart_Handle CreateLazyMirror(Dart_Handle target) {
   if (Dart_IsNull(target)) {
     return target;
   }
   if (Dart_IsLibrary(target)) {
@@ skipping 589 matching lines @@
     // provide reflective access to the error.
     Dart_PropagateError(CreateMirroredError(result));
   }
 
   Dart_Handle wrapped_result = CreateInstanceMirror(result);
   if (Dart_IsError(wrapped_result)) {
     Dart_PropagateError(wrapped_result);
   }
   Dart_SetReturnValue(args, wrapped_result);
 }
 

[Ivan Posva, 2012/07/23 20:57:32]

Should be two lines vertical white space. Can you please fix the ones above as
well to get the file consistent again? Thanks!

+void NATIVE_ENTRY_FUNCTION(LocalObjectMirrorImpl_getField)(
+    Dart_NativeArguments args) {
+  Dart_Handle mirror = Dart_GetNativeArgument(args, 0);
+  Dart_Handle fieldName = Dart_GetNativeArgument(args, 1);
+
+  Dart_Handle reflectee = UnwrapMirror(mirror);
+  Dart_Handle result = Dart_GetField(reflectee, fieldName);
+  if (Dart_IsError(result)) {
+    // Instead of propagating the error from a GetField directly, we
+    // provide reflective access to the error.
+    Dart_PropagateError(CreateMirroredError(result));
+  }
+
+  Dart_Handle wrapped_result = CreateInstanceMirror(result);
+  if (Dart_IsError(wrapped_result)) {
+    Dart_PropagateError(wrapped_result);
+  }
+  Dart_SetReturnValue(args, wrapped_result);
+}
+

[Ivan Posva, 2012/07/23 20:57:32]

ditto

+void NATIVE_ENTRY_FUNCTION(LocalObjectMirrorImpl_setField)(
+    Dart_NativeArguments args) {
+  Dart_Handle mirror = Dart_GetNativeArgument(args, 0);
+  Dart_Handle fieldName = Dart_GetNativeArgument(args, 1);
+  Dart_Handle raw_arg = Dart_GetNativeArgument(args, 2);
+
+  Dart_Handle reflectee = UnwrapMirror(mirror);
+  Dart_Handle set_arg = UnwrapArg(raw_arg);
+  if (Dart_IsError(set_arg)) {
+    Dart_PropagateError(set_arg);
+  }
+  Dart_Handle result = Dart_SetField(reflectee, fieldName, set_arg);
+  if (Dart_IsError(result)) {
+    // Instead of propagating the error from a SetField directly, we
+    // provide reflective access to the error.
+    Dart_PropagateError(CreateMirroredError(result));
+  }
+
+  Dart_Handle wrapped_result = CreateInstanceMirror(result);
+  if (Dart_IsError(wrapped_result)) {
+    Dart_PropagateError(wrapped_result);
+  }
+  Dart_SetReturnValue(args, wrapped_result);
+}
+
 void HandleMirrorsMessage(Isolate* isolate,
                           Dart_Port reply_port,
                           const Instance& message) {
   UNIMPLEMENTED();
 }
 
 }  // namespace dart