Rename and rearrange some internal vs SPI methods

Author: parkera

Sources/FoundationEssentials/Decimal/Decimal+Compatibility.swift

@@ -410,7 +410,7 @@ public func _NSDecimalCompact(_ number: UnsafeMutablePointer<Decimal>) {
     _ locale: Any? = nil
 ) -> String {
     let useLocale = locale as? Locale
-    return decimal.pointee.toString(with: useLocale)
+    return decimal.pointee._toString(with: useLocale)
 }
 
 #if FOUNDATION_FRAMEWORK
@@ -431,7 +431,7 @@ internal func __NSStringToDecimal(
     processedLength: UnsafeMutablePointer<Int>,
     result: UnsafeMutablePointer<Decimal>
 ) {
-    let parsed = Decimal.decimal(
+    let parsed = Decimal._decimal(
         from: string.utf8,
         decimalSeparator: ".".utf8,
         matchEntireString: false

Sources/FoundationEssentials/Decimal/Decimal+Conformances.swift

@@ -142,7 +142,7 @@ internal import _ForSwiftFoundation
 extension Decimal : CustomStringConvertible {
     public init?(string: __shared String, locale: __shared Locale? = nil) {
         let decimalSeparator = locale?.decimalSeparator ?? "."
-        guard let value = Decimal.decimal(
+        guard let value = Decimal._decimal(
             from: string.utf8,
             decimalSeparator: decimalSeparator.utf8,
             matchEntireString: false
@@ -153,7 +153,7 @@ extension Decimal : CustomStringConvertible {
     }
 
     public var description: String {
-        return self.toString()
+        return self._toString()
     }
 }
 

Sources/FoundationEssentials/Decimal/Decimal.swift

@@ -183,8 +183,23 @@ extension Decimal {
 
 // MARK: - String
 extension Decimal {
+#if FOUNDATION_FRAMEWORK
+#else
     @_spi(SwiftCorelibsFoundation)
     public func toString(with locale: Locale? = nil) -> String {
+        _toString(with: locale)
+    }
+    
+    @_spi(SwiftCorelibsFoundation)
+    public static func decimal(
+        from stringView: String.UTF8View,
+        decimalSeparator: String.UTF8View,
+        matchEntireString: Bool
+    ) -> (result: Decimal?, processedLength: Int) {
+        _decimal(from: stringView, decimalSeparator: decimalSeparator, matchEntireString: matchEntireString)
+    }
+#endif
+    internal func _toString(with locale: Locale? = nil) -> String {
         if self.isNaN {
             return "NaN"
         }
@@ -235,8 +250,7 @@ extension Decimal {
         return String(buffer.reversed())
     }
 
-    @_spi(SwiftCorelibsFoundation)
-    public static func decimal(
+    internal static func _decimal(
         from stringView: String.UTF8View,
         decimalSeparator: String.UTF8View,
         matchEntireString: Bool

Sources/FoundationEssentials/JSON/JSONDecoder.swift

@@ -1074,7 +1074,7 @@ extension FixedWidthInteger {
 
 extension Decimal {
     init?(entire string: String) {
-        guard let value = Decimal.decimal(
+        guard let value = Decimal._decimal(
             from: string.utf8,
             decimalSeparator: ".".utf8,
             matchEntireString: true

Tests/FoundationEssentialsTests/DecimalTests.swift

@@ -112,10 +112,10 @@ final class DecimalTests : XCTestCase {
 
     func test_DescriptionWithLocale() {
         let decimal = Decimal(string: "-123456.789")!
-        XCTAssertEqual(decimal.toString(with: nil), "-123456.789")
-        let en = decimal.toString(with: Locale(identifier: "en_GB"))
+        XCTAssertEqual(decimal._toString(with: nil), "-123456.789")
+        let en = decimal._toString(with: Locale(identifier: "en_GB"))
         XCTAssertEqual(en, "-123456.789")
-        let fr = decimal.toString(with: Locale(identifier: "fr_FR"))
+        let fr = decimal._toString(with: Locale(identifier: "fr_FR"))
         XCTAssertEqual(fr, "-123456,789")
     }