Fix circular types

Author: jcmosc

Sources/ComputeCxx/Graph/AGGraph.cpp

@@ -202,27 +202,6 @@ AGGraphRef AGGraphGetAttributeGraph(AGAttribute attribute) {
     AG::precondition_failure("no graph: %u", attribute);
 }
 
-// AGSubgraphRef AGGraphGetAttributeSubgraph(AGAttribute attribute) {
-//     auto subgraph = AGGraphGetAttributeSubgraph2(attribute);
-//     if (subgraph == nullptr) {
-//         AG::precondition_failure("no subgraph");
-//     }
-//
-//     return subgraph;
-// }
-//
-// AGSubgraphRef AGGraphGetAttributeSubgraph2(AGAttribute attribute) {
-//     auto attribute_id = AG::AttributeID(attribute);
-//     attribute_id.to_node_ptr().assert_valid();
-//
-//     auto subgraph = attribute_id.subgraph();
-//     if (subgraph == nullptr) {
-//         AG::precondition_failure("internal error");
-//     }
-//
-//     return subgraph->to_cf();
-// }
-
 AGAttributeInfo AGGraphGetAttributeInfo(AGAttribute attribute) {
     auto attribute_id = AG::AttributeID(attribute);
     if (!attribute_id.is_direct()) {

Sources/ComputeCxx/Graph/AGGraph.h

@@ -104,15 +104,8 @@ CF_EXPORT
 CF_REFINED_FOR_SWIFT
 AGGraphRef AGGraphGetAttributeGraph(AGAttribute attribute);
 
-// TODO: fix circular types
 
-// CF_EXPORT
-// CF_REFINED_FOR_SWIFT
-// AGSubgraphRef AGGraphGetAttributeSubgraph(AGAttribute attribute);
 
-// CF_EXPORT
-// CF_REFINED_FOR_SWIFT
-// AGSubgraphRef AGGraphGetAttributeSubgraph2(AGAttribute attribute);
 
 // TODO: need this?
 // typedef struct AGAttributeType {

Sources/ComputeCxx/Subgraph/AGSubgraph.cpp

@@ -111,6 +111,27 @@ AGUnownedGraphContextRef AGSubgraphGetCurrentGraphContext() {
     return (AGUnownedGraphContextRef)current->graph();
 }
 
+AGSubgraphRef AGGraphGetAttributeSubgraph(AGAttribute attribute) {
+    auto subgraph = AGGraphGetAttributeSubgraph2(attribute);
+    if (subgraph == nullptr) {
+        AG::precondition_failure("no subgraph");
+    }
+
+    return subgraph;
+}
+
+AGSubgraphRef AGGraphGetAttributeSubgraph2(AGAttribute attribute) {
+    auto attribute_id = AG::AttributeID(attribute);
+    attribute_id.to_node_ptr().assert_valid();
+
+    auto subgraph = attribute_id.subgraph();
+    if (subgraph == nullptr) {
+        AG::precondition_failure("internal error");
+    }
+
+    return subgraph->to_cf();
+}
+
 #pragma mark - Children
 
 void AGSubgraphAddChild(AGSubgraphRef subgraph, AGSubgraphRef child) { AGSubgraphAddChild2(subgraph, child, 0); }

Sources/ComputeCxx/Subgraph/AGSubgraph.h

@@ -43,6 +43,14 @@ CF_EXPORT
 CF_REFINED_FOR_SWIFT
 AGUnownedGraphContextRef AGSubgraphGetCurrentGraphContext(AGSubgraphRef subgraph);
 
+CF_EXPORT
+CF_REFINED_FOR_SWIFT
+AGSubgraphRef AGGraphGetAttributeSubgraph(AGAttribute attribute);
+
+CF_EXPORT
+CF_REFINED_FOR_SWIFT
+AGSubgraphRef AGGraphGetAttributeSubgraph2(AGAttribute attribute);
+
 // MARK: Children
 
 CF_EXPORT