From c660eb55fe39caf4153648c7ff613c2b0010e2f4 Mon Sep 17 00:00:00 2001
From: Nathan Daly <nhdaly@gmail.com>
Date: Sat, 1 Feb 2020 17:12:02 -0500
Subject: [PATCH 1/2] Add support for rem(x,y,::RoundingMode) for FixedDecimals

However, the simple overload does not seem to work, since it is
ambiguous with `rem(x,y,::RoundingMode{Up})`, for example, so for `rem`,
we're manually overloading all RoundingModes.
---
 src/FixedPointDecimals.jl |  9 +++++++++
 test/runtests.jl          | 23 ++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/FixedPointDecimals.jl b/src/FixedPointDecimals.jl
index 0b78e3c..e5a344c 100644
--- a/src/FixedPointDecimals.jl
+++ b/src/FixedPointDecimals.jl
@@ -294,6 +294,15 @@ end
 for remfn in [:rem, :mod, :mod1, :min, :max]
     @eval Base.$remfn(x::T, y::T) where {T <: FD} = reinterpret(T, $remfn(x.i, y.i))
 end
+if VERSION >= v"1.4.0-"
+    # TODO: Add support for (RoundFromZero, RoundNearest, RoundNearestTiesAway), which
+    #       aren't supported for Ints.
+    for R in (RoundToZero, RoundUp, RoundDown)
+        RType = typeof(R)
+        Base.rem(x::T, y::T, r::RType) where {T <: FD} = reinterpret(T, rem(x.i, y.i, r))
+    end
+end
+
 # TODO: When we upgrade to a min julia version >=1.4 (i.e Julia 2.0), this block can be
 # dropped in favor of three-argument `div`, below.
 for divfn in [:div, :fld, :fld1, :cld]
diff --git a/test/runtests.jl b/test/runtests.jl
index 33fe0ac..d62329d 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -537,13 +537,26 @@ end
         @test one(FD{Int32, 2}) ÷ one(FD{Int64, 6}) isa FD{Int64, 6}
     end
 
+    @testset "rem with rounding modes" begin
+        if VERSION >= v"1.4.0-"
+            # TODO: Test RoundFromZero, RoundNearest, RoundNearestTiesAway
+            #       See: https://github.com/JuliaLang/julia/issues/34519
+            @testset for x in keyvalues[FD2],
+                         R in (RoundToZero, RoundUp, RoundDown)
+                @test rem(x, 2one(x), R) === rem(x, 2, R) === reinterpret(FD2, rem(x.i, FD2(2).i, R))
+            end
+        end
+        @testset for x in keyvalues[FD2], f in (fld, cld, fld1, div)
+            @test f(x, 2one(x)) === f(x, 2) === FD2(f(x.i, FD2(2).i))
+        end
+    end
+
     @testset "div with rounding modes" begin
         if VERSION >= v"1.4.0-"
-            @testset for x in keyvalues[FD2]
-                # TODO: Test RoundFromZero -- https://github.com/JuliaLang/julia/issues/34519
-                for R in (RoundToZero, RoundUp, RoundDown, RoundNearest, RoundNearestTiesAway)
-                    @test div(x, 2one(x), R) === div(x, 2, R) === FD2(div(x.i, FD2(2).i, R))
-                end
+            # TODO: Test RoundFromZero -- https://github.com/JuliaLang/julia/issues/34519
+            @testset for x in keyvalues[FD2],
+                         R in (RoundToZero, RoundUp, RoundDown, RoundNearest, RoundNearestTiesAway)
+                @test div(x, 2one(x), R) === div(x, 2, R) === FD2(div(x.i, FD2(2).i, R))
             end
         end
         @testset for x in keyvalues[FD2], f in (fld, cld, fld1, div)

From b585127a660778d5f81febad6da0fb9b8123f2bc Mon Sep 17 00:00:00 2001
From: Nathan Daly <NHDaly@gmail.com>
Date: Sun, 19 Apr 2020 11:54:14 -0400
Subject: [PATCH 2/2] Simplify Rounding Mode methods

Apply PR Review suggestion from @omus.
---
 src/FixedPointDecimals.jl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/FixedPointDecimals.jl b/src/FixedPointDecimals.jl
index e5a344c..660c345 100644
--- a/src/FixedPointDecimals.jl
+++ b/src/FixedPointDecimals.jl
@@ -298,8 +298,7 @@ if VERSION >= v"1.4.0-"
     # TODO: Add support for (RoundFromZero, RoundNearest, RoundNearestTiesAway), which
     #       aren't supported for Ints.
     for R in (RoundToZero, RoundUp, RoundDown)
-        RType = typeof(R)
-        Base.rem(x::T, y::T, r::RType) where {T <: FD} = reinterpret(T, rem(x.i, y.i, r))
+        Base.rem(x::T, y::T, r::typeof(R)) where {T <: FD} = reinterpret(T, rem(x.i, y.i, r))
     end
 end