[StdlibIntKit] Cleanup.

oscbyspro · Jun 22, 2024 · 73e6f22 · 73e6f22
1 parent 20ea5c5
commit 73e6f22
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 21 deletions.
diff --git a/Sources/StdlibIntKit/StdlibInt+Bitwise.swift b/Sources/StdlibIntKit/StdlibInt+Bitwise.swift
@@ -20,19 +20,19 @@ extension StdlibInt {
     // MARK: Transformations
     //=------------------------------------------------------------------------=
 
-    @inlinable public static prefix func ~(instance: Self) -> Self {
+    @inlinable public static prefix func ~(instance: consuming Self) -> Self {
         Self(~instance.base)
     }
 
-    @inlinable public static func ^=(lhs: inout Self, rhs: Self) {
+    @inlinable public static func ^=(lhs: inout Self, rhs: borrowing Self) {
         lhs.base ^= rhs.base
     }
 
-    @inlinable public static func |=(lhs: inout Self, rhs: Self) {
+    @inlinable public static func |=(lhs: inout Self, rhs: borrowing Self) {
         lhs.base |= rhs.base
     }
 
-    @inlinable public static func &=(lhs: inout Self, rhs: Self) {
+    @inlinable public static func &=(lhs: inout Self, rhs: borrowing Self) {
         lhs.base &= rhs.base
     }
 
@@ -41,6 +41,8 @@ extension StdlibInt {
     //=------------------------------------------------------------------------=
 
     @inlinable public var magnitude: Self {
-        Self(Base(raw: self.base.magnitude()))
+        consuming get {
+            Self(Base(raw: self.base.magnitude()))
+        }
     }
 }
diff --git a/Sources/StdlibIntKit/StdlibInt+Count.swift b/Sources/StdlibIntKit/StdlibInt+Count.swift
@@ -20,15 +20,25 @@ extension StdlibInt {
     // MARK: Utilities
     //=------------------------------------------------------------------------=
 
-    @inlinable public var bitWidth: Int {
+    @inlinable public var bitWidth: Swift.Int {
         borrowing get {
-            Int(self.base.withUnsafeBinaryIntegerElements({ $0.entropy() }))
+            self.base.withUnsafeBinaryIntegerElements {
+                Swift.Int($0.entropy())
+            }
         }
     }
 
-    @inlinable public var trailingZeroBitCount: Int {
+    @inlinable public var trailingZeroBitCount: Swift.Int {
         borrowing get {
-            Int(self.base.withUnsafeBinaryIntegerElements({ $0.isZero ? 1 : $0.body.ascending(0) }))
+            self.base.withUnsafeBinaryIntegerElements {
+                Swift.assert($0.isNormal, "InfiniInt<IX>/elements")
+
+                if  $0.body.count.isZero {
+                    return Swift.Int(IX($0.appendix.toggled()))
+                }   else {
+                    return Swift.Int($0.body.ascending(000000))
+                }
+            }
         }
     }
 }
diff --git a/Sources/StdlibIntKit/StdlibInt+Validation.swift b/Sources/StdlibIntKit/StdlibInt+Validation.swift
@@ -32,8 +32,8 @@ extension StdlibInt {
         self.init(truncatingIfNeeded: source)
     }
 
-    @inlinable public init(truncatingIfNeeded source: some Swift.BinaryInteger) {
-        let appendix = Bit(source < .zero)
+    @inlinable public init<T>(truncatingIfNeeded source: T) where T: Swift.BinaryInteger {
+        let appendix = Bit(T.isSigned && source < T.zero)
         let body = source.words.lazy.map(UX.init(raw:))
         self.init(Base(consume body, repeating: appendix))
     }

diff --git a/Tests/StdlibIntKitTests/StdlibInt+Bitwise.swift b/Tests/StdlibIntKitTests/StdlibInt+Bitwise.swift
@@ -22,17 +22,20 @@ extension StdlibIntTests {
     //=------------------------------------------------------------------------=
 
     func testBitwiseNot() {
-        func check(_ test: Test, _ instance: T, _ expectation: T) {
-            test.same(~instance, expectation)
-            test.same(~expectation, instance)
+        let values: [T] = [
+            0x00000000000000000000000000000000,
+            0x00000000000000000000000000000001,
+            0x0f0e0d0c0b0a09080706050403020100,
+            0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff,
+            0xfffffffffffffffffffffffffffffffe,
+            0xffffffffffffffffffffffffffffffff,
+        ]
+
+        for value in values  {
+            let expectation: T = -1 - value
+            Test().same(~value, expectation)
+            Test().same(~expectation, value)
         }
-
-        check(Test(), 0x00000000000000000000000000000000 as T,   -0x00000000000000000000000000000001 as T)
-        check(Test(), 0x00000000000000000000000000000001 as T,   -0x00000000000000000000000000000002 as T)
-        check(Test(), 0x0f0e0d0c0b0a09080706050403020100 as T,   -0x0f0e0d0c0b0a09080706050403020101 as T)
-        check(Test(), 0xf0f1f2f3f4f5f6f7f8f9fafbfcfdfeff as T,   -0xf0f1f2f3f4f5f6f7f8f9fafbfcfdff00 as T)
-        check(Test(), 0xfffffffffffffffffffffffffffffffe as T,   -0xffffffffffffffffffffffffffffffff as T)
-        check(Test(), 0xffffffffffffffffffffffffffffffff as T, -0x0100000000000000000000000000000000 as T)
     }
 
     func testBitwiseAnd() {