Cleanup: NumericTextStyles.

Author: oscbyspro

Sources/DiffableTextStylesXNumeric/Helpers/Lexicon.swift

@@ -51,12 +51,12 @@ extension Lexicon {
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    /// Requires that formatter.numberStyle == .decimal.
+    /// Requires that formatter.numberStyle == .none.
     @inlinable static func standard(_ formatter: NumberFormatter) -> Lexicon {
         Lexicon(signs: .standard(formatter), digits: .standard(formatter), separators: .standard(formatter))
     }
 
-    /// Requires that formatter.numberStyle == .decimal.
+    /// Requires that formatter.numberStyle == .none.
     @inlinable static func currency(_ formatter: NumberFormatter) -> Lexicon {
         Lexicon(signs: .currency(formatter), digits: .currency(formatter), separators: .currency(formatter))
     }

Sources/DiffableTextStylesXNumeric/Models/Scheme+Currency.swift

@@ -21,26 +21,26 @@ import Foundation
     // MARK: State
     //=------------------------------------------------------------------------=
 
-    @usableFromInline let label: Label
+    @usableFromInline let identifier: ID
     @usableFromInline let lexicon: Lexicon
+    @usableFromInline let label: Label
     @usableFromInline let defaults: Defaults
-    @usableFromInline let identifier: ID
 
     //=------------------------------------------------------------------------=
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
     @inlinable init(_ identifier: ID) {
         let formatter = NumberFormatter()
-        formatter.numberStyle = .decimal
         formatter.locale = identifier.locale
         formatter.currencyCode = identifier.code
+        assert(formatter.numberStyle == .none)
         //=--------------------------------------=
         // MARK: Instantiate
         //=--------------------------------------=
         self.identifier = identifier
         //=--------------------------------------=
-        // MARK: Instantiate: Style == Decimal
+        // MARK: Instantiate: Style == None
         //=--------------------------------------=
         self.lexicon = .currency(formatter)
         self.label   = .currency(identifier.locale,

Sources/DiffableTextStylesXNumeric/Models/Scheme+Standard.swift

@@ -23,21 +23,21 @@ import Foundation
 
     @usableFromInline let identifier: ID
     @usableFromInline let lexicon: Lexicon
-    
+
     //=------------------------------------------------------------------------=
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
     @inlinable init(_ identifier: ID) {
         let formatter = NumberFormatter()
-        formatter.numberStyle = .decimal
         formatter.locale = identifier.locale
+        assert(formatter.numberStyle == .none)
         //=--------------------------------------=
         // MARK: Instantiate
         //=--------------------------------------=
         self.identifier = identifier
         //=--------------------------------------=
-        // MARK: Instantiate: Style == Decimal
+        // MARK: Instantiate: Style == None
         //=--------------------------------------=
         self.lexicon = .standard(formatter)
     }

Sources/DiffableTextStylesXNumeric/Number/Digit.swift

@@ -50,7 +50,9 @@ import Foundation
     // MARK: Localization
     //=------------------------------------------------------------------------=
 
+    /// Requires that formatter.numberStyle == .none.
     @inlinable func standard(_ formatter: NumberFormatter) -> Character! {
-        formatter.string(from: numericValue as NSNumber)!.first
+        assert(formatter.numberStyle == .none)
+        return formatter.string(from: numericValue as NSNumber)!.first
     }
 }