Skip to content

Optimize Flags code #164

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 3 commits into from
Aug 16, 2025
Merged

Optimize Flags code #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fca220
Update flags
Kyle-Ye Aug 16, 2025
9855922
Update dependency
Kyle-Ye Aug 16, 2025
6a6d8ae
Fix crash issue
Kyle-Ye Aug 16, 2025
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 Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Sources/OpenGraph/Attribute/Attribute/AnyAttribute.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ extension AnyAttribute {
create(offset: offset)
}

public func setFlags(_ newFlags: Subgraph.Flags, mask: Subgraph.Flags) {
public func setFlags(_ newFlags: Flags, mask: Flags) {
flags = flags.subtracting(mask).union(newFlags.intersection(mask))
}

Expand Down
6 changes: 4 additions & 2 deletions Sources/OpenGraph/Attribute/Attribute/Attribute.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,14 @@ public struct Attribute<Value> {

// MARK: - Flags

public var flags: Subgraph.Flags {
public typealias Flags = AnyAttribute.Flags

public var flags: Flags {
get { identifier.flags }
nonmutating set { identifier.flags = newValue }
}

public func setFlags(_ newFlags: Subgraph.Flags, mask: Subgraph.Flags) {
public func setFlags(_ newFlags: Flags, mask: Flags) {
identifier.setFlags(newFlags, mask: mask)
}
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/OpenGraph/Graph/Subgraph.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ extension Subgraph {
#endif
}

public func forEach(_ flags: Subgraph.Flags, _ callback: (AnyAttribute) -> Void) {
public func forEach(_ flags: Flags, _ callback: (AnyAttribute) -> Void) {
Subgraph.apply(self, flags: flags, callback: callback)
}
}
Expand Down Expand Up @@ -62,7 +62,7 @@ extension Subgraph {
// FIXME: migrate to use @_extern(c, "xx") in Swift 6
extension Subgraph {
@_silgen_name("OGSubgraphApply")
private static func apply(_ graph: Subgraph, flags: Subgraph.Flags, callback: (AnyAttribute) -> Void)
private static func apply(_ graph: Subgraph, flags: Flags, callback: (AnyAttribute) -> Void)

@_silgen_name("OGSubgraphAddObserver")
private static func addObserver(_ graph: Subgraph, observer: () -> Void) -> Int
Expand Down
24 changes: 13 additions & 11 deletions Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AnyAttributeCompatibilityTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,34 +46,36 @@ final class AnyAttributeCompatibilityTests: AttributeTestBase {

@Test
func setFlags() throws {
typealias Flags = AnyAttribute.Flags

let attribute = AnyAttribute(Attribute(value: 0))
#expect(attribute.flags == [])

// Test mask = []
attribute.flags = []

attribute.setFlags([Subgraph.Flags(rawValue: 1)], mask: [])
attribute.setFlags([Flags(rawValue: 1)], mask: [])
#expect(attribute.flags == [])

attribute.setFlags([Subgraph.Flags(rawValue: 2)], mask: [])
attribute.setFlags([Flags(rawValue: 2)], mask: [])
#expect(attribute.flags == [])

attribute.setFlags([Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 4)], mask: [])
attribute.setFlags([Flags(rawValue: 1), Flags(rawValue: 4)], mask: [])
#expect(attribute.flags == [])

// Test mask
attribute.flags = []
attribute.setFlags([Subgraph.Flags(rawValue: 1)], mask: [Subgraph.Flags(rawValue: 1)])
#expect(attribute.flags == [Subgraph.Flags(rawValue: 1)])
attribute.setFlags([Flags(rawValue: 1)], mask: [Flags(rawValue: 1)])
#expect(attribute.flags == [Flags(rawValue: 1)])

attribute.setFlags([Subgraph.Flags(rawValue: 2)], mask: [Subgraph.Flags(rawValue: 2)])
#expect(attribute.flags == [Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 2)])
attribute.setFlags([Flags(rawValue: 2)], mask: [Flags(rawValue: 2)])
#expect(attribute.flags == [Flags(rawValue: 1), Flags(rawValue: 2)])

attribute.setFlags([Subgraph.Flags(rawValue: 4)], mask: [Subgraph.Flags(rawValue: 1)])
#expect(attribute.flags == [Subgraph.Flags(rawValue: 2)])
attribute.setFlags([Flags(rawValue: 4)], mask: [Flags(rawValue: 1)])
#expect(attribute.flags == [Flags(rawValue: 2)])

attribute.setFlags([Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 4)], mask: [Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 2), Subgraph.Flags(rawValue: 4)])
#expect(attribute.flags == [Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 4)])
attribute.setFlags([Flags(rawValue: 1), Flags(rawValue: 4)], mask: [Flags(rawValue: 1), Flags(rawValue: 2), Flags(rawValue: 4)])
#expect(attribute.flags == [Flags(rawValue: 1), Flags(rawValue: 4)])
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AttributeCompatibilityTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ final class AttributeCompatibilityTests: AttributeTestBase {
@Test
func flagSetter() {
let attribute = Attribute(value: ())
attribute.flags = Subgraph.Flags(rawValue: 1)
#expect(attribute.flags == Subgraph.Flags(rawValue: 1))
attribute.flags = .init(rawValue: 1)
#expect(attribute.flags == .init(rawValue: 1))
}
}
#endif
1 change: 1 addition & 0 deletions Tests/OpenGraphCompatibilityTests/Graph/GraphCompatibilityTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import Testing
import Foundation

@MainActor
struct GraphCompatibilityTests {
@Test
func graphCreate() throws {
Expand Down