Update implementation of OGUnownedGraphContextRef

Author: jcmosc

Sources/OpenGraph/Graph/Graph.swift

@@ -9,7 +9,7 @@ public import OpenGraphCxx
 
 extension Graph {
     public static func typeIndex(
-        ctx: GraphContext,
+        ctx: UnownedGraphContext,
         body: _AttributeBody.Type,
         valueType: Metadata,
         flags: _AttributeType.Flags,

Sources/OpenGraphCxx/Graph/OGGraph.cpp

@@ -110,11 +110,11 @@ void OGGraphSetContext(OGGraphRef graph, const void * _Nullable context) {
     graph->context.set_context(context);
 }
 
-OGGraphContextRef OGGraphGetGraphContext(OGGraphRef graph) {
+OGUnownedGraphContextRef OGGraphGetGraphContext(OGGraphRef graph) {
     if (graph->context.isInvalid()) {
         OG::precondition_failure("invalidated graph");
     }
-    return reinterpret_cast<OGGraphContextRef>(reinterpret_cast<uintptr_t>(graph) + sizeof(CFRuntimeBase));
+    return reinterpret_cast<OGUnownedGraphContextRef>(&graph->context.get_graph());
 }
 
 void OGGraphInvalidate(OGGraphRef graph) {

Sources/OpenGraphCxx/Graph/OGGraphContext.cpp

@@ -5,6 +5,6 @@
 #include <OpenGraph/OGGraphContext.h>
 #include <OpenGraph/Private/CFRuntime.h>
 
-OGGraphRef OGGraphContextGetGraph(OGGraphContextRef context) {
+OGGraphRef OGGraphContextGetGraph(void *context) {
     return reinterpret_cast<OGGraphRef>(reinterpret_cast<uintptr_t>(context) - sizeof(CFRuntimeBase));
 }

Sources/OpenGraphCxx/Graph/OGSubgraph.cpp

@@ -95,12 +95,13 @@ void OGSubgraphSetCurrent(_Nullable OGSubgraphRef cf_subgraph) {
     }
 }
 
-OGGraphContextRef OGSubgraphGetCurrentGraphContext() {
+OGUnownedGraphContextRef OGSubgraphGetCurrentGraphContext() {
     OG::Subgraph *subgraph = OG::Subgraph::get_current();
     if (subgraph == nullptr) {
         return nullptr;
     }
-    return subgraph->get_context();
+    OG::Graph &graph = subgraph->get_graph();
+    return reinterpret_cast<OGUnownedGraphContextRef>(&graph);
 }
 
 void OGSubgraphInvalidate(OGSubgraphRef cf_subgraph) {
@@ -121,7 +122,8 @@ OGGraphRef OGSubgraphGetGraph(OGSubgraphRef cf_subgraph) {
     if (cf_subgraph->subgraph == nullptr) {
         OG::precondition_failure("accessing invalidated subgraph");
     }
-    return OGGraphContextGetGraph(cf_subgraph->subgraph->get_context());
+    // TODO
+    return nullptr;
 }
 
 void OGSubgraphAddChild(OGSubgraphRef parent, OGSubgraphRef child) {

Sources/OpenGraphCxx/Graph/Subgraph.cpp

@@ -23,9 +23,8 @@ void OG::Subgraph::apply(OGAttributeFlags flags, OG::ClosureFunction<void, OGAtt
     // TODO
 }
 
-OG::Subgraph::Subgraph(OG::SubgraphObject* cf_subgraph, OG::Graph::Context& context, OG::AttributeID):
-_cf_subgraph((OGSubgraphRef)cf_subgraph), // FIXME
-_context((OGGraphContextStorage &)context){
+OG::Subgraph::Subgraph(OG::SubgraphObject* object, OG::Graph::Context& context, OG::AttributeID):
+_object(object), _graph(context.get_graph()), _graph_context_id(context.get_id()) {
     // TODO
 }
 

Sources/OpenGraphCxx/Graph/Subgraph.hpp

@@ -13,11 +13,11 @@
 
 typedef struct OG_BRIDGED_TYPE(id) OGGraphStorage * OGGraphRef OG_SWIFT_NAME(Graph);
 typedef struct OG_BRIDGED_TYPE(id) OGSubgraphStorage * OGSubgraphRef OG_SWIFT_NAME(Subgraph);
-typedef struct OG_BRIDGED_TYPE(id) OGGraphContextStorage * OGGraphContextRef OG_SWIFT_NAME(GraphContext);
+typedef struct OGGraphContextStorage * OGUnownedGraphContextRef OG_SWIFT_STRUCT OG_SWIFT_NAME(UnownedGraphContext);
 
 struct OGGraphStorage;
-struct OGGraphContextStorage;
 struct OGSubgraphStorage;
+struct OGGraphContextStorage;
 
 typedef uint32_t OGAttribute OG_SWIFT_STRUCT OG_SWIFT_NAME(AnyAttribute);
 
@@ -63,7 +63,7 @@ void OGGraphSetContext(OGGraphRef graph, const void * _Nullable context) OG_SWIF
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-OGGraphContextRef OGGraphGetGraphContext(OGGraphRef graph) OG_SWIFT_NAME(getter:OGGraphRef.graphContext(self:));
+OGUnownedGraphContextRef OGGraphGetGraphContext(OGGraphRef graph) OG_SWIFT_NAME(getter:OGGraphRef.graphContext(self:));
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT

Sources/OpenGraphCxx/include/OpenGraph/OGGraph.h

@@ -18,7 +18,7 @@ OG_EXTERN_C_BEGIN
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-OGGraphRef OGGraphContextGetGraph(OGGraphContextRef context) OG_SWIFT_NAME(getter:OGGraphContextRef.graph(self:));
+OGGraphRef OGGraphContextGetGraph(void *context);
 
 OG_EXTERN_C_END
 

Sources/OpenGraphCxx/include/OpenGraph/OGGraphContext.h

@@ -42,7 +42,7 @@ void OGSubgraphSetCurrent(_Nullable OGSubgraphRef cf_subgraph) OG_SWIFT_NAME(set
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-_Nullable OGGraphContextRef OGSubgraphGetCurrentGraphContext(void) OG_SWIFT_NAME(getter:OGSubgraphRef.currentGraphContext());
+_Nullable OGUnownedGraphContextRef OGSubgraphGetCurrentGraphContext(void) OG_SWIFT_NAME(getter:OGSubgraphRef.currentGraphContext());
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT

Sources/OpenGraphCxx/include/OpenGraph/OGSubgraph.h

@@ -64,6 +64,11 @@ class Graph final {
             _context = context;
         }
 
+        OG_INLINE OG_CONSTEXPR
+        OGUniqueID get_id() OG_NOEXCEPT {
+            return _id;
+        }
+        
         OG_INLINE
         void set_invalidation_callback(ClosureFunction<void, OGAttribute> invalidation_callback) OG_NOEXCEPT {
             _invalidation_callback = invalidation_callback;
@@ -181,7 +186,7 @@ struct OGGraphStorage {
 };
 
 struct OGGraphContextStorage {
-    OG::Graph::Context context;
+    OG::Graph graph;
 };
 
 OG_ASSUME_NONNULL_END