Cleanup, NumbericTextStyles: merged (Bounds, Precision)+[branch] files and moved Scheme files up a level.

Author: oscbyspro

Sources/DiffableTextStylesXNumeric/Models/Bounds+Autocorrect.swift

@@ -7,6 +7,8 @@
 // See http://www.apache.org/licenses/LICENSE-2.0 for license information.
 //=----------------------------------------------------------------------------=
 
+import DiffableTextKit
+
 //*============================================================================*
 // MARK: * Bounds
 //*============================================================================*
@@ -85,3 +87,92 @@ extension Bounds: CustomStringConvertible {
         "\(min) to \(max)"
     }
 }
+
+//=----------------------------------------------------------------------------=
+// MARK: + Upstream - Autocorrect
+//=----------------------------------------------------------------------------=
+
+extension Bounds {
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Value
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func autocorrect(_ value: inout Value) {
+        value = Swift.min(Swift.max(min, value), max)
+    }
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Number
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func autocorrect(_ number: inout Number) {
+        autocorrect(&number.sign)
+    }
+
+    //=------------------------------------------------------------------------=
+    // MARK: Number - Helpers
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func autocorrect(_ sign: inout Sign) {
+        switch sign {
+        case .positive: if max <= .zero, min != .zero { sign.toggle() }
+        case .negative: if min >= .zero               { sign.toggle() }
+        }
+    }
+}
+
+//=----------------------------------------------------------------------------=
+// MARK: + Downstream - Autovalidate
+//=----------------------------------------------------------------------------=
+
+extension Bounds {
+
+    //=------------------------------------------------------------------------=
+    // MARK: Number
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func autovalidate(_ number: Number) throws {
+        try autovalidate(number.sign)
+    }
+
+    //=------------------------------------------------------------------------=
+    // MARK: Number - Helpers
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func autovalidate(_ sign: Sign) throws {
+        guard sign == sign.transformed(autocorrect) else {
+            throw Info([.mark(sign), "is not in", .mark(self)])
+        }
+    }
+
+    //=------------------------------------------------------------------------=
+    // MARK: Value
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func autovalidate(_ value: Value, _ number: inout Number) throws {
+        if try edge(value), number.removeSeparatorAsSuffix() {
+            Info.print([.autocorrection, .mark(number), "does not fit a fraction separator"])
+        }
+    }
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Value - Helpers
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func edge(_ value: Value) throws -> Bool {
+        if min < value  && value < max { return false }
+        //=--------------------------------------=
+        // MARK: Value == Max
+        //=--------------------------------------=
+        if value == max { return value > .zero || min == max }
+        //=--------------------------------------=
+        // MARK: Value == Min
+        //=--------------------------------------=
+        if value == min { return value < .zero }
+        //=--------------------------------------=
+        // MARK: Value Is Out Of Bounds
+        //=--------------------------------------=
+        throw Info([.mark(value), "is not in", .mark(self)])
+    }
+}

Sources/DiffableTextStylesXNumeric/Models/Bounds+Autovalidate.swift

@@ -137,6 +137,60 @@ extension Precision: Brrr {
     }
 }
 
+//=----------------------------------------------------------------------------=
+// MARK: + Upstream - Autocorrect
+//=----------------------------------------------------------------------------=
+
+extension Precision {
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Number
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func autocorrect(_ number: inout Number) {
+        number.trim(max: upper)
+    }
+}
+
+//=----------------------------------------------------------------------------=
+// MARK: + Downstream - Autovalidate
+//=----------------------------------------------------------------------------=
+
+extension Precision {
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Number
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func autovalidate(_ number: inout Number, _ count: Count) throws {
+        let capacity = try capacity(count)
+        //=--------------------------------------=
+        // MARK: Autocorrect
+        //=--------------------------------------=
+        if capacity.fraction <= 0 || capacity.value <= 0, number.removeSeparatorAsSuffix() {
+            Info.print([.autocorrection, .mark(number), "does not fit a fraction separator"])
+        }
+    }
+    
+    //=------------------------------------------------------------------------=
+    // MARK: Number - Helpers
+    //=------------------------------------------------------------------------=
+    
+    @inlinable func capacity(_ count: Count) throws -> Count {
+        let capacity = upper.map((&-, count))
+        //=--------------------------------------=
+        // MARK: Validate Each Component
+        //=--------------------------------------=
+        if let component = capacity.first(where: (.<, 0)) {
+            throw Info([.mark(component), "digits exceed max precision", .mark(upper[component])])
+        }
+        //=--------------------------------------=
+        // MARK: Done
+        //=--------------------------------------=
+        return capacity
+    }
+}
+
 //*============================================================================*
 // MARK: * Precision x Namespace
 //*============================================================================*