Add OGGraph.outputValue API (#66)

Kyle-Ye · web-flow · commit 315468c6339c · 2024-04-06T15:44:33.000+08:00
diff --git a/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios.swiftinterface b/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios.swiftinterface
@@ -398,6 +398,18 @@ extension AttributeGraph.AGGraph {
 	public static func withoutUpdate<Value>(_ body: () -> Value) -> Value
 }
 
+extension AttributeGraph.AGGraph {
+	@_silgen_name("AGGraphGetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func outputValue<Value>() -> Swift.UnsafePointer<Value>?
+
+	@_silgen_name("AGGraphSetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func setOutputValue<Value>(_ value: Swift.UnsafePointer<Value>)
+}
+
 // MARK: - AGSubgraph
 
 extension AttributeGraph.AGSubgraph {
diff --git a/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-ios.swiftinterface b/AG/AttributeGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-ios.swiftinterface
@@ -398,6 +398,18 @@ extension AttributeGraph.AGGraph {
 	public static func withoutUpdate<Value>(_ body: () -> Value) -> Value
 }
 
+extension AttributeGraph.AGGraph {
+	@_silgen_name("AGGraphGetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func outputValue<Value>() -> Swift.UnsafePointer<Value>?
+
+	@_silgen_name("AGGraphSetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func setOutputValue<Value>(_ value: Swift.UnsafePointer<Value>)
+}
+
 // MARK: - AGSubgraph
 
 extension AttributeGraph.AGSubgraph {
diff --git a/AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios-simulator.swiftinterface
@@ -398,6 +398,18 @@ extension AttributeGraph.AGGraph {
 	public static func withoutUpdate<Value>(_ body: () -> Value) -> Value
 }
 
+extension AttributeGraph.AGGraph {
+	@_silgen_name("AGGraphGetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func outputValue<Value>() -> Swift.UnsafePointer<Value>?
+
+	@_silgen_name("AGGraphSetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func setOutputValue<Value>(_ value: Swift.UnsafePointer<Value>)
+}
+
 // MARK: - AGSubgraph
 
 extension AttributeGraph.AGSubgraph {
diff --git a/AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/AG/AttributeGraph.xcframework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
@@ -398,6 +398,18 @@ extension AttributeGraph.AGGraph {
 	public static func withoutUpdate<Value>(_ body: () -> Value) -> Value
 }
 
+extension AttributeGraph.AGGraph {
+	@_silgen_name("AGGraphGetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func outputValue<Value>() -> Swift.UnsafePointer<Value>?
+
+	@_silgen_name("AGGraphSetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func setOutputValue<Value>(_ value: Swift.UnsafePointer<Value>)
+}
+
 // MARK: - AGSubgraph
 
 extension AttributeGraph.AGSubgraph {
diff --git a/AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-macos.swiftinterface b/AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-macos.swiftinterface
@@ -398,6 +398,18 @@ extension AttributeGraph.AGGraph {
 	public static func withoutUpdate<Value>(_ body: () -> Value) -> Value
 }
 
+extension AttributeGraph.AGGraph {
+	@_silgen_name("AGGraphGetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func outputValue<Value>() -> Swift.UnsafePointer<Value>?
+
+	@_silgen_name("AGGraphSetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func setOutputValue<Value>(_ value: Swift.UnsafePointer<Value>)
+}
+
 // MARK: - AGSubgraph
 
 extension AttributeGraph.AGSubgraph {
diff --git a/AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-macos.swiftinterface b/AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-macos.swiftinterface
@@ -398,6 +398,18 @@ extension AttributeGraph.AGGraph {
 	public static func withoutUpdate<Value>(_ body: () -> Value) -> Value
 }
 
+extension AttributeGraph.AGGraph {
+	@_silgen_name("AGGraphGetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func outputValue<Value>() -> Swift.UnsafePointer<Value>?
+
+	@_silgen_name("AGGraphSetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func setOutputValue<Value>(_ value: Swift.UnsafePointer<Value>)
+}
+
 // MARK: - AGSubgraph
 
 extension AttributeGraph.AGSubgraph {
diff --git a/AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-macos.swiftinterface b/AG/AttributeGraph.xcframework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-macos.swiftinterface
@@ -398,6 +398,18 @@ extension AttributeGraph.AGGraph {
 	public static func withoutUpdate<Value>(_ body: () -> Value) -> Value
 }
 
+extension AttributeGraph.AGGraph {
+	@_silgen_name("AGGraphGetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func outputValue<Value>() -> Swift.UnsafePointer<Value>?
+
+	@_silgen_name("AGGraphSetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func setOutputValue<Value>(_ value: Swift.UnsafePointer<Value>)
+}
+
 // MARK: - AGSubgraph
 
 extension AttributeGraph.AGSubgraph {
diff --git a/AG/Sources/Modules/AttributeGraph.swiftmodule/template.swiftinterface b/AG/Sources/Modules/AttributeGraph.swiftmodule/template.swiftinterface
@@ -394,6 +394,18 @@ extension AttributeGraph.AGGraph {
 	public static func withoutUpdate<Value>(_ body: () -> Value) -> Value
 }
 
+extension AttributeGraph.AGGraph {
+	@_silgen_name("AGGraphGetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func outputValue<Value>() -> Swift.UnsafePointer<Value>?
+
+	@_silgen_name("AGGraphSetOutputValue")
+	@inline(__always)
+	@inlinable
+	public static func setOutputValue<Value>(_ value: Swift.UnsafePointer<Value>)
+}
+
 // MARK: - AGSubgraph
 
 extension AttributeGraph.AGSubgraph {
diff --git a/Sources/OpenGraph/Attribute/Rule/Rule.swift b/Sources/OpenGraph/Attribute/Rule/Rule.swift
@@ -22,8 +22,8 @@ extension Rule {
         let rule = pointer.assumingMemoryBound(to: Self.self)
         let value = rule.pointee.value
         // Verified for RELEASE_2023
-        withUnsafePointer(to: value) { valuePointer in
-            OGGraphSetOutputValue(valuePointer)
+        withUnsafePointer(to: value) { value in
+            OGGraph.setOutputValue(value)
         }
     }
 
@@ -32,8 +32,8 @@ extension Rule {
             return
         }
         // Verified for RELEASE_2023
-        withUnsafePointer(to: initialValue) { valuePointer in
-            OGGraphSetOutputValue(valuePointer)
+        withUnsafePointer(to: initialValue) { value in
+            OGGraph.setOutputValue(value)
         }
     }
 }
@@ -91,13 +91,3 @@ extension Rule where Self: Hashable {
             .assumingMemoryBound(to: Value.self)
     }
 }
-
-@_silgen_name("OGGraphGetOutputValue")
-@inline(__always)
-@inlinable
-func OGGraphGetOutputValue<Value>() -> UnsafePointer<Value>?
-
-@_silgen_name("OGGraphSetOutputValue")
-@inline(__always)
-@inlinable
-func OGGraphSetOutputValue<Value>(_ valuePointer: UnsafePointer<Value>)
diff --git a/Sources/OpenGraph/Attribute/Rule/RuleContext.swift b/Sources/OpenGraph/Attribute/Rule/RuleContext.swift
@@ -43,17 +43,17 @@ public struct RuleContext<Value> {
 
     public var value: Value {
         unsafeAddress {
-            OGGraphGetOutputValue()!
+            OGGraph.outputValue()!
         }
         nonmutating set {
-            withUnsafePointer(to: newValue) { valuePointer in
-                OGGraphSetOutputValue(valuePointer)
+            withUnsafePointer(to: newValue) { value in
+                OGGraph.setOutputValue(value)
             }
         }
     }
     
     public var hasValue: Bool {
-        let valuePointer: UnsafePointer<Value>? = OGGraphGetOutputValue()
+        let valuePointer: UnsafePointer<Value>? = OGGraph.outputValue()
         return valuePointer != nil
     }
         
diff --git a/Sources/OpenGraph/Attribute/Rule/StatefulRule.swift b/Sources/OpenGraph/Attribute/Rule/StatefulRule.swift
@@ -28,8 +28,8 @@ extension StatefulRule {
         guard let initialValue else {
             return
         }
-        withUnsafePointer(to: initialValue) { valuePointer in
-            OGGraphSetOutputValue(valuePointer)
+        withUnsafePointer(to: initialValue) { value in
+            OGGraph.setOutputValue(value)
         }
     }
 }
@@ -46,7 +46,7 @@ extension StatefulRule {
     }
     
     public var value: Value {
-        unsafeAddress { OGGraphGetOutputValue()! }
+        unsafeAddress { OGGraph.outputValue()! }
         nonmutating set { context.value = newValue }
     }
     
diff --git a/Sources/OpenGraph/Graph/OGGraph.swift b/Sources/OpenGraph/Graph/OGGraph.swift
@@ -58,3 +58,16 @@ extension OGGraph {
         return body()
     }
 }
+
+extension OGGraph {
+    // NOTE: Currently Swift does not support generic computed variable
+    @_silgen_name("OGGraphGetOutputValue")
+    @inline(__always)
+    @inlinable
+    public static func outputValue<Value>() -> UnsafePointer<Value>?
+
+    @_silgen_name("OGGraphSetOutputValue")
+    @inline(__always)
+    @inlinable
+    public static func setOutputValue<Value>(_ value: UnsafePointer<Value>)
+}

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ extension Rule {`
`22`	`22`	`let rule = pointer.assumingMemoryBound(to: Self.self)`
`23`	`23`	`let value = rule.pointee.value`
`24`	`24`	`// Verified for RELEASE_2023`
`25`		`- withUnsafePointer(to: value) { valuePointer in`
`26`		`- OGGraphSetOutputValue(valuePointer)`
	`25`	`+ withUnsafePointer(to: value) { value in`
	`26`	`+ OGGraph.setOutputValue(value)`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -32,8 +32,8 @@ extension Rule {`
`32`	`32`	`return`
`33`	`33`	`}`
`34`	`34`	`// Verified for RELEASE_2023`
`35`		`- withUnsafePointer(to: initialValue) { valuePointer in`
`36`		`- OGGraphSetOutputValue(valuePointer)`
	`35`	`+ withUnsafePointer(to: initialValue) { value in`
	`36`	`+ OGGraph.setOutputValue(value)`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
`@@ -91,13 +91,3 @@ extension Rule where Self: Hashable {`
`91`	`91`	`.assumingMemoryBound(to: Value.self)`
`92`	`92`	`}`
`93`	`93`	`}`
`94`		`-`
`95`		`-@_silgen_name("OGGraphGetOutputValue")`
`96`		`-@inline(__always)`
`97`		`-@inlinable`
`98`		`-func OGGraphGetOutputValue<Value>() -> UnsafePointer<Value>?`
`99`		`-`
`100`		`-@_silgen_name("OGGraphSetOutputValue")`
`101`		`-@inline(__always)`
`102`		`-@inlinable`
`103`		`-func OGGraphSetOutputValue<Value>(_ valuePointer: UnsafePointer<Value>)`
Original file line number	Diff line number	Diff line change
`@@ -43,17 +43,17 @@ public struct RuleContext<Value> {`
`43`	`43`
`44`	`44`	`public var value: Value {`
`45`	`45`	`unsafeAddress {`
`46`		`- OGGraphGetOutputValue()!`
	`46`	`+ OGGraph.outputValue()!`
`47`	`47`	`}`
`48`	`48`	`nonmutating set {`
`49`		`- withUnsafePointer(to: newValue) { valuePointer in`
`50`		`- OGGraphSetOutputValue(valuePointer)`
	`49`	`+ withUnsafePointer(to: newValue) { value in`
	`50`	`+ OGGraph.setOutputValue(value)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public var hasValue: Bool {`
`56`		`- let valuePointer: UnsafePointer<Value>? = OGGraphGetOutputValue()`
	`56`	`+ let valuePointer: UnsafePointer<Value>? = OGGraph.outputValue()`
`57`	`57`	`return valuePointer != nil`
`58`	`58`	`}`
`59`	`59`