Rename accessors of class Field to make it more apparent as to what is being accessed - static fiel…

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 "lib/mirrors.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 584 matching lines @@
       lib.LookupClassAllowPrivate(Symbols::_LocalMethodMirror()));
   const Error& error = Error::Handle(isolate, cls.EnsureIsFinalized(isolate));
   ASSERT(error.IsNull());
 
   Field& field = Field::Handle();
   Smi& value = Smi::Handle();
 
   #define CHECK_KIND_SHIFT(name)                                               \
     field = cls.LookupField(String::Handle(String::New(#name)));               \
     ASSERT(!field.IsNull());                                                   \
-    value ^= field.value();                                                    \
+    value ^= field.StaticFieldValue();                                         \
     ASSERT(value.Value() == Mirrors::name);
   MIRRORS_KIND_SHIFT_LIST(CHECK_KIND_SHIFT)
   #undef CHECK_KIND_SHIFT
 #endif
 }
 
 
 static RawInstance* ReturnResult(const Object& result) {
   if (result.IsError()) {
     Exceptions::PropagateError(Error::Cast(result));
@@ skipping 54 matching lines @@
       getter = library.LookupLocalFunction(getter_name);
       if (!getter.IsNull()) {
         // Looking for a getter but found a regular method: closurize it.
         const Function& closure_function =
             Function::Handle(getter.ImplicitClosureFunction());
         return closure_function.ImplicitStaticClosure();
       }
     }
   } else {
     if (!field.IsUninitialized()) {
-      return field.value();
+      return field.StaticFieldValue();
     }
     // An uninitialized field was found.  Check for a getter in the field's
     // owner classs.
     const Class& klass = Class::Handle(field.owner());
     const String& internal_getter_name =
         String::Handle(Field::GetterName(getter_name));
     getter = klass.LookupStaticFunction(internal_getter_name);
   }
 
   if (!getter.IsNull() && getter.is_reflectable()) {
@@ skipping 56 matching lines @@
       // using a special null instance. This is different from a field being
       // null. Callers make sure that this null does not leak into Dartland.
       return Object::sentinel().raw();
     }
 
     // Invoke the getter and return the result.
     const Object& result = Object::Handle(
         DartEntry::InvokeFunction(getter, Object::empty_array()));
     return ReturnResult(result);
   }
-  return field.value();
+  return field.StaticFieldValue();
 }
 
 
 static RawAbstractType* InstantiateType(const AbstractType& type,
                                         const AbstractType& instantiator) {
   ASSERT(type.IsFinalized());
   PROPAGATE_IF_MALFORMED(type);
   ASSERT(type.IsCanonical() || type.IsTypeParameter() || type.IsBoundedType());
 
   if (type.IsInstantiated() || instantiator.IsNull()) {
@@ skipping 845 matching lines @@
     ThrowNoSuchMethod(AbstractType::Handle(klass.RareType()),
                       internal_setter_name,
                       setter,
                       Object::null_array(),
                       Object::null_array(),
                       InvocationMirror::kStatic,
                       InvocationMirror::kSetter);
     UNREACHABLE();
   }
 
-  field.set_value(value);
+  field.SetStaticFieldValue(value);
   return value.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(ClassMirror_invokeConstructor, 5) {
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
   const Class& klass = Class::Handle(ref.GetClassReferent());
   GET_NATIVE_ARGUMENT(Type, type, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(
       String, constructor_name, arguments->NativeArgAt(2));
@@ skipping 276 matching lines @@
     ThrowNoSuchMethod(Instance::null_instance(),
                       internal_setter_name,
                       setter,
                       Object::null_array(),
                       Object::null_array(),
                       InvocationMirror::kTopLevel,
                       InvocationMirror::kSetter);
     UNREACHABLE();
   }
 
-  field.set_value(value);
+  field.SetStaticFieldValue(value);
   return value.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(MethodMirror_owner, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
   GET_NATIVE_ARGUMENT(AbstractType, instantiator, arguments->NativeArgAt(1));
   const Function& func = Function::Handle(ref.GetFunctionReferent());
   if (func.IsNonImplicitClosureFunction()) {
     return CreateMethodMirror(Function::Handle(
@@ skipping 166 matching lines @@
 }
 
 DEFINE_NATIVE_ENTRY(TypeMirror_subtypeTest, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, a, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, b, arguments->NativeArgAt(1));
   return Bool::Get(a.IsSubtypeOf(b, NULL)).raw();
 }
 
 
 }  // namespace dart