Use the object store object accessor functionality

Realm/RLMAccessor.h

@@ -18,14 +18,7 @@
 
 #import <Foundation/Foundation.h>
 
-
-@class RLMObjectSchema, RLMProperty, RLMObjectBase, RLMProperty;
-
-#ifdef __cplusplus
-typedef NSUInteger RLMCreationOptions;
-#else
-typedef NS_OPTIONS(NSUInteger, RLMCreationOptions);
-#endif
+@class RLMObjectSchema, RLMProperty, RLMObjectBase;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -45,7 +38,7 @@ FOUNDATION_EXTERN id __nullable RLMDynamicGet(RLMObjectBase *obj, RLMProperty *p
 FOUNDATION_EXTERN id __nullable RLMDynamicGetByName(RLMObjectBase *obj, NSString *propName, bool asList);
 
 // by property/column
-void RLMDynamicSet(RLMObjectBase *obj, RLMProperty *prop, id val, RLMCreationOptions options);
+void RLMDynamicSet(RLMObjectBase *obj, RLMProperty *prop, id val);
 
 //
 // Class modification

Realm/RLMAccessor.hpp

@@ -0,0 +1,116 @@
+////////////////////////////////////////////////////////////////////////////
+//
+// Copyright 2017 Realm Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////
+
+#import "RLMAccessor.h"
+
+#import "object_accessor.hpp"
+
+#import "RLMUtil.hpp"
+
+@class RLMRealm;
+class RLMClassInfo;
+class RLMObservationInfo;
+
+// realm::util::Optional<id> doesn't work due to that explicitly invoking the
+// destructor isn't allowed under ARC, so this covers the subset of Optional
+// that we actually need.
+struct RLMOptionalId {
+    id value;
+    RLMOptionalId(id value) : value(value) { }
+    explicit operator bool() const noexcept { return value; }
+    id operator*() const noexcept { return value; }
+};
+
+class RLMAccessorContext {
+public:
+    // Accessor context interfact
+    RLMAccessorContext(RLMAccessorContext& parent, realm::Property const& property);
+
+    id box(realm::List&&);
+    id box(realm::Results&&);
+    id box(realm::Object&&);
+    id box(realm::RowExpr);
+
+    id box(realm::BinaryData v) { return RLMBinaryDataToNSData(v); }
+    id box(bool v) { return @(v); }
+    id box(double v) { return @(v); }
+    id box(float v) { return @(v); }
+    id box(long long v) { return @(v); }
+    id box(realm::StringData v) { return RLMStringDataToNSString(v); }
+    id box(realm::Timestamp v) { return RLMTimestampToNSDate(v); }
+    id box(realm::Mixed v) { return RLMMixedToObjc(v); }
+
+    id box(realm::util::Optional<bool> v) { return v ? @(*v) : nil; }
+    id box(realm::util::Optional<double> v) { return v ? @(*v) : nil; }
+    id box(realm::util::Optional<float> v) { return v ? @(*v) : nil; }
+    id box(realm::util::Optional<int64_t> v) { return v ? @(*v) : nil; }
+
+    void will_change(realm::Row const&, realm::Property const&);
+    void will_change(realm::Object& obj, realm::Property const& prop) { will_change(obj.row(), prop); }
+    void did_change();
+
+    RLMOptionalId value_for_property(id dict, std::string const&, size_t prop_index);
+    RLMOptionalId default_value_for_property(realm::ObjectSchema const&,
+                                             std::string const& prop);
+
+    template<typename Func>
+    void enumerate_list(__unsafe_unretained const id v, Func&& func) {
+        for (id value in v) {
+            func(value);
+        }
+    }
+
+    template<typename T>
+    T unbox(id v, bool create = false, bool update = false);
+
+    bool is_null(id v) { return v == NSNull.null; }
+    id null_value() { return NSNull.null; }
+    id no_value() { return nil; }
+    bool allow_missing(id v) { return [v isKindOfClass:[NSArray class]]; }
+
+    std::string print(id obj) { return [obj description].UTF8String; }
+
+    // Internal API
+    RLMAccessorContext(RLMObjectBase *parentObject, const realm::Property *property = nullptr);
+    RLMAccessorContext(RLMRealm *realm, RLMClassInfo& info, bool promote=true);
+
+    // The property currently being accessed; needed for KVO things for boxing
+    // List and Results
+    RLMProperty *currentProperty;
+
+private:
+    __unsafe_unretained RLMRealm *const _realm;
+    RLMClassInfo& _info;
+    // If true, promote unmanaged RLMObjects passed to box() with create=true
+    // rather than copying them
+    bool _promote_existing = true;
+    // Parent object of the thing currently being processed, for KVO purposes
+    __unsafe_unretained RLMObjectBase *const _parentObject = nil;
+
+    // Cached default values dictionary to avoid having to call the class method
+    // for every property
+    NSDictionary *_defaultValues;
+
+    bool _nilHack = false;
+
+    RLMObservationInfo *_observationInfo = nullptr;
+    NSString *_kvoPropertyName = nil;
+
+    id defaultValue(NSString *key);
+    id propertyValue(id obj, size_t propIndex, __unsafe_unretained RLMProperty *const prop);
+};