Skip to content

Commit 93e713f

Browse files
authored
Update OGAttribute to AnyAttribute (#84)
1 parent 7f22fb5 commit 93e713f

File tree

27 files changed

+245
-213
lines changed

27 files changed

+245
-213
lines changed

AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios.swiftinterface

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,31 @@ import _StringProcessing
1010

1111
// MARK: - Attribute Related
1212

13-
// MARK: - AGAttribute
13+
// MARK: - AnyAttribute
1414

15-
extension AGAttribute {
15+
public typealias AnyAttribute = AGAttribute
16+
17+
extension AttributeGraph.AnyAttribute {
1618
public init<Value>(_ attribute: AttributeGraph.Attribute<Value>)
1719
public func unsafeCast<Value>(to type: Value.Type) -> AttributeGraph.Attribute<Value>
18-
public static var current: AGAttribute? { get }
19-
public func unsafeOffset(at offset: Int) -> AGAttribute
20+
public static var current: AnyAttribute? { get }
21+
public func unsafeOffset(at offset: Int) -> AnyAttribute
2022
public func setFlags(_ newFlags: AGAttributeFlags, mask: AGAttributeFlags)
21-
public func addInput(_ attribute: AGAttribute, options: AGInputOptions = [], token: Swift.Int)
23+
public func addInput(_ attribute: AnyAttribute, options: AGInputOptions = [], token: Swift.Int)
2224
public func addInput<Value>(_ attribute: AttributeGraph.Attribute<Value>, options: AGInputOptions = [], token: Int)
2325
public func visitBody<Visitor: AttributeGraph.AttributeBodyVisitor>(_ visitor: inout Visitor);
2426
public func mutateBody<Value>(as: Value.Type, invalidating: Swift.Bool, _ body: (inout Value) -> ())
25-
public func breadthFirstSearch(options: AGSearchOptions = [], _: (AGAttribute) -> Swift.Bool) -> Swift.Bool
27+
public func breadthFirstSearch(options: AGSearchOptions = [], _: (AnyAttribute) -> Swift.Bool) -> Swift.Bool
2628
public var _bodyType: Any.Type { get }
2729
public var _bodyPointer: UnsafeRawPointer { get }
2830
public var valueType: Any.Type { get }
29-
public var indirectDependency: AGAttribute? {
31+
public var indirectDependency: AnyAttribute? {
3032
get
3133
nonmutating set
3234
}
3335
}
3436

35-
extension AGAttribute: Swift.CustomStringConvertible {
37+
extension AttributeGraph.AnyAttribute: Swift.CustomStringConvertible {
3638
public var description: Swift.String { get }
3739
}
3840

@@ -110,9 +112,11 @@ extension AttributeGraph.Attribute {
110112
public init<R: AttributeGraph.StatefulRule>(_ rule: R) where R.Value == Value
111113
}
112114

113-
// MARK: - AGWeakAttribute
115+
// MARK: - AnyWeakAttribute
116+
117+
public typealias AnyWeakAttribute = AGWeakAttribute
114118

115-
extension AGWeakAttribute {
119+
extension AttributeGraph.AnyWeakAttribute {
116120
@_alwaysEmitIntoClient
117121
public init(_ attribute: AGAttribute?) {
118122
self = __AGCreateWeakAttribute(attribute ?? .nil)
@@ -135,20 +139,20 @@ extension AGWeakAttribute {
135139
return attribute == .nil ? nil : attribute
136140
}
137141
set {
138-
self = AGWeakAttribute(newValue)
142+
self = AnyWeakAttribute(newValue)
139143
}
140144
}
141145
}
142146

143-
extension AGWeakAttribute: Hashable {
147+
extension AttributeGraph.AnyWeakAttribute: Hashable {
144148
@_alwaysEmitIntoClient
145149
public func hash(into hasher: inout Swift.Hasher) {
146150
hasher.combine(raw_attribute)
147151
hasher.combine(subgraph_id)
148152
}
149153

150154
@_alwaysEmitIntoClient
151-
public static func == (lhs: AGWeakAttribute, rhs: AGWeakAttribute) -> Swift.Bool {
155+
public static func == (lhs: AnyWeakAttribute, rhs: AnyWeakAttribute) -> Swift.Bool {
152156
lhs.raw_attribute == rhs.raw_attribute && lhs.subgraph_id == rhs.subgraph_id
153157
}
154158

@@ -158,7 +162,7 @@ extension AGWeakAttribute: Hashable {
158162
}
159163
}
160164

161-
extension AGWeakAttribute: CustomStringConvertible {
165+
extension AttributeGraph.AnyWeakAttribute: CustomStringConvertible {
162166
@_alwaysEmitIntoClient
163167
public var description: String {
164168
attribute?.description ?? "nil"
@@ -173,9 +177,9 @@ extension AGWeakAttribute: CustomStringConvertible {
173177
@dynamicMemberLookup
174178
public struct WeakAttribute<Value> {
175179
@usableFromInline
176-
internal var base: AGWeakAttribute
180+
internal var base: AnyWeakAttribute
177181
@_alwaysEmitIntoClient
178-
public init(base: AGWeakAttribute) { self.base = base }
182+
public init(base: AnyWeakAttribute) { self.base = base }
179183
public init()
180184
public init(_ attribute: AttributeGraph.Attribute<Value>)
181185
public init(_ attribute: AttributeGraph.Attribute<Value>?)

AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-ios.swiftinterface

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,31 @@ import _StringProcessing
1010

1111
// MARK: - Attribute Related
1212

13-
// MARK: - AGAttribute
13+
// MARK: - AnyAttribute
1414

15-
extension AGAttribute {
15+
public typealias AnyAttribute = AGAttribute
16+
17+
extension AttributeGraph.AnyAttribute {
1618
public init<Value>(_ attribute: AttributeGraph.Attribute<Value>)
1719
public func unsafeCast<Value>(to type: Value.Type) -> AttributeGraph.Attribute<Value>
18-
public static var current: AGAttribute? { get }
19-
public func unsafeOffset(at offset: Int) -> AGAttribute
20+
public static var current: AnyAttribute? { get }
21+
public func unsafeOffset(at offset: Int) -> AnyAttribute
2022
public func setFlags(_ newFlags: AGAttributeFlags, mask: AGAttributeFlags)
21-
public func addInput(_ attribute: AGAttribute, options: AGInputOptions = [], token: Swift.Int)
23+
public func addInput(_ attribute: AnyAttribute, options: AGInputOptions = [], token: Swift.Int)
2224
public func addInput<Value>(_ attribute: AttributeGraph.Attribute<Value>, options: AGInputOptions = [], token: Int)
2325
public func visitBody<Visitor: AttributeGraph.AttributeBodyVisitor>(_ visitor: inout Visitor);
2426
public func mutateBody<Value>(as: Value.Type, invalidating: Swift.Bool, _ body: (inout Value) -> ())
25-
public func breadthFirstSearch(options: AGSearchOptions = [], _: (AGAttribute) -> Swift.Bool) -> Swift.Bool
27+
public func breadthFirstSearch(options: AGSearchOptions = [], _: (AnyAttribute) -> Swift.Bool) -> Swift.Bool
2628
public var _bodyType: Any.Type { get }
2729
public var _bodyPointer: UnsafeRawPointer { get }
2830
public var valueType: Any.Type { get }
29-
public var indirectDependency: AGAttribute? {
31+
public var indirectDependency: AnyAttribute? {
3032
get
3133
nonmutating set
3234
}
3335
}
3436

35-
extension AGAttribute: Swift.CustomStringConvertible {
37+
extension AttributeGraph.AnyAttribute: Swift.CustomStringConvertible {
3638
public var description: Swift.String { get }
3739
}
3840

@@ -110,9 +112,11 @@ extension AttributeGraph.Attribute {
110112
public init<R: AttributeGraph.StatefulRule>(_ rule: R) where R.Value == Value
111113
}
112114

113-
// MARK: - AGWeakAttribute
115+
// MARK: - AnyWeakAttribute
116+
117+
public typealias AnyWeakAttribute = AGWeakAttribute
114118

115-
extension AGWeakAttribute {
119+
extension AttributeGraph.AnyWeakAttribute {
116120
@_alwaysEmitIntoClient
117121
public init(_ attribute: AGAttribute?) {
118122
self = __AGCreateWeakAttribute(attribute ?? .nil)
@@ -135,20 +139,20 @@ extension AGWeakAttribute {
135139
return attribute == .nil ? nil : attribute
136140
}
137141
set {
138-
self = AGWeakAttribute(newValue)
142+
self = AnyWeakAttribute(newValue)
139143
}
140144
}
141145
}
142146

143-
extension AGWeakAttribute: Hashable {
147+
extension AttributeGraph.AnyWeakAttribute: Hashable {
144148
@_alwaysEmitIntoClient
145149
public func hash(into hasher: inout Swift.Hasher) {
146150
hasher.combine(raw_attribute)
147151
hasher.combine(subgraph_id)
148152
}
149153

150154
@_alwaysEmitIntoClient
151-
public static func == (lhs: AGWeakAttribute, rhs: AGWeakAttribute) -> Swift.Bool {
155+
public static func == (lhs: AnyWeakAttribute, rhs: AnyWeakAttribute) -> Swift.Bool {
152156
lhs.raw_attribute == rhs.raw_attribute && lhs.subgraph_id == rhs.subgraph_id
153157
}
154158

@@ -158,7 +162,7 @@ extension AGWeakAttribute: Hashable {
158162
}
159163
}
160164

161-
extension AGWeakAttribute: CustomStringConvertible {
165+
extension AttributeGraph.AnyWeakAttribute: CustomStringConvertible {
162166
@_alwaysEmitIntoClient
163167
public var description: String {
164168
attribute?.description ?? "nil"
@@ -173,9 +177,9 @@ extension AGWeakAttribute: CustomStringConvertible {
173177
@dynamicMemberLookup
174178
public struct WeakAttribute<Value> {
175179
@usableFromInline
176-
internal var base: AGWeakAttribute
180+
internal var base: AnyWeakAttribute
177181
@_alwaysEmitIntoClient
178-
public init(base: AGWeakAttribute) { self.base = base }
182+
public init(base: AnyWeakAttribute) { self.base = base }
179183
public init()
180184
public init(_ attribute: AttributeGraph.Attribute<Value>)
181185
public init(_ attribute: AttributeGraph.Attribute<Value>?)

AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios-simulator.swiftinterface

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,31 @@ import _StringProcessing
1010

1111
// MARK: - Attribute Related
1212

13-
// MARK: - AGAttribute
13+
// MARK: - AnyAttribute
1414

15-
extension AGAttribute {
15+
public typealias AnyAttribute = AGAttribute
16+
17+
extension AttributeGraph.AnyAttribute {
1618
public init<Value>(_ attribute: AttributeGraph.Attribute<Value>)
1719
public func unsafeCast<Value>(to type: Value.Type) -> AttributeGraph.Attribute<Value>
18-
public static var current: AGAttribute? { get }
19-
public func unsafeOffset(at offset: Int) -> AGAttribute
20+
public static var current: AnyAttribute? { get }
21+
public func unsafeOffset(at offset: Int) -> AnyAttribute
2022
public func setFlags(_ newFlags: AGAttributeFlags, mask: AGAttributeFlags)
21-
public func addInput(_ attribute: AGAttribute, options: AGInputOptions = [], token: Swift.Int)
23+
public func addInput(_ attribute: AnyAttribute, options: AGInputOptions = [], token: Swift.Int)
2224
public func addInput<Value>(_ attribute: AttributeGraph.Attribute<Value>, options: AGInputOptions = [], token: Int)
2325
public func visitBody<Visitor: AttributeGraph.AttributeBodyVisitor>(_ visitor: inout Visitor);
2426
public func mutateBody<Value>(as: Value.Type, invalidating: Swift.Bool, _ body: (inout Value) -> ())
25-
public func breadthFirstSearch(options: AGSearchOptions = [], _: (AGAttribute) -> Swift.Bool) -> Swift.Bool
27+
public func breadthFirstSearch(options: AGSearchOptions = [], _: (AnyAttribute) -> Swift.Bool) -> Swift.Bool
2628
public var _bodyType: Any.Type { get }
2729
public var _bodyPointer: UnsafeRawPointer { get }
2830
public var valueType: Any.Type { get }
29-
public var indirectDependency: AGAttribute? {
31+
public var indirectDependency: AnyAttribute? {
3032
get
3133
nonmutating set
3234
}
3335
}
3436

35-
extension AGAttribute: Swift.CustomStringConvertible {
37+
extension AttributeGraph.AnyAttribute: Swift.CustomStringConvertible {
3638
public var description: Swift.String { get }
3739
}
3840

@@ -110,9 +112,11 @@ extension AttributeGraph.Attribute {
110112
public init<R: AttributeGraph.StatefulRule>(_ rule: R) where R.Value == Value
111113
}
112114

113-
// MARK: - AGWeakAttribute
115+
// MARK: - AnyWeakAttribute
116+
117+
public typealias AnyWeakAttribute = AGWeakAttribute
114118

115-
extension AGWeakAttribute {
119+
extension AttributeGraph.AnyWeakAttribute {
116120
@_alwaysEmitIntoClient
117121
public init(_ attribute: AGAttribute?) {
118122
self = __AGCreateWeakAttribute(attribute ?? .nil)
@@ -135,20 +139,20 @@ extension AGWeakAttribute {
135139
return attribute == .nil ? nil : attribute
136140
}
137141
set {
138-
self = AGWeakAttribute(newValue)
142+
self = AnyWeakAttribute(newValue)
139143
}
140144
}
141145
}
142146

143-
extension AGWeakAttribute: Hashable {
147+
extension AttributeGraph.AnyWeakAttribute: Hashable {
144148
@_alwaysEmitIntoClient
145149
public func hash(into hasher: inout Swift.Hasher) {
146150
hasher.combine(raw_attribute)
147151
hasher.combine(subgraph_id)
148152
}
149153

150154
@_alwaysEmitIntoClient
151-
public static func == (lhs: AGWeakAttribute, rhs: AGWeakAttribute) -> Swift.Bool {
155+
public static func == (lhs: AnyWeakAttribute, rhs: AnyWeakAttribute) -> Swift.Bool {
152156
lhs.raw_attribute == rhs.raw_attribute && lhs.subgraph_id == rhs.subgraph_id
153157
}
154158

@@ -158,7 +162,7 @@ extension AGWeakAttribute: Hashable {
158162
}
159163
}
160164

161-
extension AGWeakAttribute: CustomStringConvertible {
165+
extension AttributeGraph.AnyWeakAttribute: CustomStringConvertible {
162166
@_alwaysEmitIntoClient
163167
public var description: String {
164168
attribute?.description ?? "nil"
@@ -173,9 +177,9 @@ extension AGWeakAttribute: CustomStringConvertible {
173177
@dynamicMemberLookup
174178
public struct WeakAttribute<Value> {
175179
@usableFromInline
176-
internal var base: AGWeakAttribute
180+
internal var base: AnyWeakAttribute
177181
@_alwaysEmitIntoClient
178-
public init(base: AGWeakAttribute) { self.base = base }
182+
public init(base: AnyWeakAttribute) { self.base = base }
179183
public init()
180184
public init(_ attribute: AttributeGraph.Attribute<Value>)
181185
public init(_ attribute: AttributeGraph.Attribute<Value>?)

AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-ios-simulator.swiftinterface

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,31 @@ import _StringProcessing
1010

1111
// MARK: - Attribute Related
1212

13-
// MARK: - AGAttribute
13+
// MARK: - AnyAttribute
1414

15-
extension AGAttribute {
15+
public typealias AnyAttribute = AGAttribute
16+
17+
extension AttributeGraph.AnyAttribute {
1618
public init<Value>(_ attribute: AttributeGraph.Attribute<Value>)
1719
public func unsafeCast<Value>(to type: Value.Type) -> AttributeGraph.Attribute<Value>
18-
public static var current: AGAttribute? { get }
19-
public func unsafeOffset(at offset: Int) -> AGAttribute
20+
public static var current: AnyAttribute? { get }
21+
public func unsafeOffset(at offset: Int) -> AnyAttribute
2022
public func setFlags(_ newFlags: AGAttributeFlags, mask: AGAttributeFlags)
21-
public func addInput(_ attribute: AGAttribute, options: AGInputOptions = [], token: Swift.Int)
23+
public func addInput(_ attribute: AnyAttribute, options: AGInputOptions = [], token: Swift.Int)
2224
public func addInput<Value>(_ attribute: AttributeGraph.Attribute<Value>, options: AGInputOptions = [], token: Int)
2325
public func visitBody<Visitor: AttributeGraph.AttributeBodyVisitor>(_ visitor: inout Visitor);
2426
public func mutateBody<Value>(as: Value.Type, invalidating: Swift.Bool, _ body: (inout Value) -> ())
25-
public func breadthFirstSearch(options: AGSearchOptions = [], _: (AGAttribute) -> Swift.Bool) -> Swift.Bool
27+
public func breadthFirstSearch(options: AGSearchOptions = [], _: (AnyAttribute) -> Swift.Bool) -> Swift.Bool
2628
public var _bodyType: Any.Type { get }
2729
public var _bodyPointer: UnsafeRawPointer { get }
2830
public var valueType: Any.Type { get }
29-
public var indirectDependency: AGAttribute? {
31+
public var indirectDependency: AnyAttribute? {
3032
get
3133
nonmutating set
3234
}
3335
}
3436

35-
extension AGAttribute: Swift.CustomStringConvertible {
37+
extension AttributeGraph.AnyAttribute: Swift.CustomStringConvertible {
3638
public var description: Swift.String { get }
3739
}
3840

@@ -110,9 +112,11 @@ extension AttributeGraph.Attribute {
110112
public init<R: AttributeGraph.StatefulRule>(_ rule: R) where R.Value == Value
111113
}
112114

113-
// MARK: - AGWeakAttribute
115+
// MARK: - AnyWeakAttribute
116+
117+
public typealias AnyWeakAttribute = AGWeakAttribute
114118

115-
extension AGWeakAttribute {
119+
extension AttributeGraph.AnyWeakAttribute {
116120
@_alwaysEmitIntoClient
117121
public init(_ attribute: AGAttribute?) {
118122
self = __AGCreateWeakAttribute(attribute ?? .nil)
@@ -135,20 +139,20 @@ extension AGWeakAttribute {
135139
return attribute == .nil ? nil : attribute
136140
}
137141
set {
138-
self = AGWeakAttribute(newValue)
142+
self = AnyWeakAttribute(newValue)
139143
}
140144
}
141145
}
142146

143-
extension AGWeakAttribute: Hashable {
147+
extension AttributeGraph.AnyWeakAttribute: Hashable {
144148
@_alwaysEmitIntoClient
145149
public func hash(into hasher: inout Swift.Hasher) {
146150
hasher.combine(raw_attribute)
147151
hasher.combine(subgraph_id)
148152
}
149153

150154
@_alwaysEmitIntoClient
151-
public static func == (lhs: AGWeakAttribute, rhs: AGWeakAttribute) -> Swift.Bool {
155+
public static func == (lhs: AnyWeakAttribute, rhs: AnyWeakAttribute) -> Swift.Bool {
152156
lhs.raw_attribute == rhs.raw_attribute && lhs.subgraph_id == rhs.subgraph_id
153157
}
154158

@@ -158,7 +162,7 @@ extension AGWeakAttribute: Hashable {
158162
}
159163
}
160164

161-
extension AGWeakAttribute: CustomStringConvertible {
165+
extension AttributeGraph.AnyWeakAttribute: CustomStringConvertible {
162166
@_alwaysEmitIntoClient
163167
public var description: String {
164168
attribute?.description ?? "nil"
@@ -173,9 +177,9 @@ extension AGWeakAttribute: CustomStringConvertible {
173177
@dynamicMemberLookup
174178
public struct WeakAttribute<Value> {
175179
@usableFromInline
176-
internal var base: AGWeakAttribute
180+
internal var base: AnyWeakAttribute
177181
@_alwaysEmitIntoClient
178-
public init(base: AGWeakAttribute) { self.base = base }
182+
public init(base: AnyWeakAttribute) { self.base = base }
179183
public init()
180184
public init(_ attribute: AttributeGraph.Attribute<Value>)
181185
public init(_ attribute: AttributeGraph.Attribute<Value>?)

0 commit comments

Comments
 (0)