Skip to content

fix: use subgraphOrNil across graph backends #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kyle-Ye merged 1 commit into from
Sep 26, 2026
Merged

fix: use subgraphOrNil across graph backends #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Scripts/CI/ag_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ filepath() {
}

REPO_ROOT="$(dirname $(dirname $(dirname $(filepath $0))))"
DARWINPRIVATEFRAMEWORKS_FALLBACK_REVISION="157294d5c4d5bde4e13e24347f0f8c50e47c79dc"
DARWINPRIVATEFRAMEWORKS_FALLBACK_REVISION="f917dcc75c52e045a6af30336b2ae63320a9a650"

clone_checkout_ag() {
cd $REPO_ROOT
Expand Down
3 changes: 1 addition & 2 deletions Sources/OpenAttributeGraphCxx/include/OpenAttributeGraph/OAGAttribute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ OAGSubgraphRef OAGGraphGetAttributeSubgraph(OAGAttribute attribute) OAG_SWIFT_NA

OAG_EXPORT
OAG_REFINED_FOR_SWIFT
_Nullable OAGSubgraphRef OAGGraphGetAttributeSubgraph2(OAGAttribute attribute) OAG_SWIFT_NAME(getter:OAGAttribute.subgraph2(self:));
_Nullable OAGSubgraphRef OAGGraphGetAttributeSubgraph2(OAGAttribute attribute) OAG_SWIFT_NAME(getter:OAGAttribute.subgraphOrNil(self:));

OAG_EXPORT
OAG_REFINED_FOR_SWIFT
Expand All @@ -172,4 +172,3 @@ OAG_IMPLICIT_BRIDGING_DISABLED
OAG_ASSUME_NONNULL_END

#endif /* OAGAttribute_h */

2 changes: 0 additions & 2 deletions Sources/OpenAttributeGraphShims/Adapter/Compute.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ public typealias OAGValueOptions = IAGValueOptions

extension AnyAttribute {
public typealias Flags = Subgraph.Flags

public var subgraph2: Subgraph? { nil }
}

extension Subgraph {
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenAttributeGraphShims/Adapter/DanceUIGraph.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ public struct AnyAttribute: RawRepresentable, Hashable, CustomStringConvertible,
Subgraph(base.subgraph)
}

public var subgraph2: Subgraph? {
public var subgraphOrNil: Subgraph? {
base == .nil ? nil : subgraph
}

Expand Down
2 changes: 1 addition & 1 deletion ...AttributeGraphCompatibilityTests/Attribute/Attribute/AnyAttributeCompatibilityTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ struct AnyAttributeCompatibilityTests {
@Test
func subgraph() {
let identifier = Attribute(value: 0).identifier
#expect(identifier.subgraph2 != nil)
#expect(identifier.subgraphOrNil != nil)
}

@Test
Expand Down
Loading