Fix BigInt conversion tests for f=0 & f=1

Author: NHDaly

src/FixedPointDecimals.jl

@@ -303,19 +303,19 @@ function Base.convert(::Type{FD{T, f}}, x::Integer) where {T, f}
     # Perform x * C, and check for overflow. This is cheaper than a widemul, especially for
     # 128-bit T, since those widen into a BigInt.
     v = _mul_checked_overflow(throw_inexact, xT, C)
-    reinterpret(FD{T, f}, v)
+    return reinterpret(FD{T, f}, v)
 end
 function Base.convert(::Type{FD{BigInt, f}}, x::Integer) where {f}
     # We specialize on f==1, since julia can't eliminate BigInt multiplication.
-    if f == 1
+    if f == 0
         # If x is already a BigInt, this is a no-op, otherwise we alloc a new BigInt.
         return reinterpret(FD{BigInt, f}, BigInt(x))
     end
     # For the normal case, we multiply by C, which produces a BigInt value.
     C = coefficient(FD{BigInt, f})
     # This can't throw since BigInt and BigFloat can hold any number.
     v = x * C
-    reinterpret(FD{BigInt, f}, v)
+    return reinterpret(FD{BigInt, f}, v)
 end
 
 # x * y - if overflow, report an InexactError(FDT, )

test/FixedDecimal.jl

@@ -316,12 +316,18 @@ end
         @test convert(FixedDecimal{BigInt,2}, UInt128(1)).i == BigInt(100)
         @test convert(FixedDecimal{BigInt,2}, Int128(-1)).i == BigInt(-100)
         @test convert(FixedDecimal{BigInt,2}, typemax(UInt128)).i == BigInt(typemax(UInt128))*100
+
+        @test convert(FixedDecimal{BigInt, 1}, Int128(1)).i == BigInt(10)
+        @test convert(FixedDecimal{BigInt, 0}, Int128(1)).i == BigInt(1)
     end
 
     @testset "Convert from Big* to BigInt" begin
         @test convert(FixedDecimal{BigInt,2}, BigInt(1)).i == BigInt(100)
         @test convert(FixedDecimal{BigInt,2}, BigFloat(1)).i == BigInt(100)
         @test convert(FixedDecimal{BigInt,2}, BigFloat(1.5)).i == BigInt(150)
+
+        @test convert(FixedDecimal{BigInt, 1}, BigInt(1)).i == BigInt(10)
+        @test convert(FixedDecimal{BigInt, 0}, BigInt(1)).i == BigInt(1)
     end
 end
 
@@ -388,7 +394,7 @@ end  # if @static Int === Int64
 @testset "BigInt conversion performance" begin
     b = BigInt(2)
     # Special-cased f=1 to not allocate for BigInt => FD conversion
-    @test @allocated(convert(FixedDecimal{BigInt, 1}, b)) == 0
+    @test @allocated(convert(FixedDecimal{BigInt, 0}, b)) == 0
 end
 
 end  # module PerfTests