From 486edf4c30226c9d83104513081fc2a3ef988659 Mon Sep 17 00:00:00 2001
From: Tim Holy <tim.holy@gmail.com>
Date: Sat, 11 Feb 2017 09:30:18 -0600
Subject: [PATCH] Work around another ambiguity and centralize floattype,
 nbitsfrac, and rawtype.

---
 src/FixedPointNumbers.jl | 12 ++++++++++--
 src/fixed.jl             |  3 ---
 src/normed.jl            |  4 ----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/FixedPointNumbers.jl b/src/FixedPointNumbers.jl
index db79d48c..d5102c27 100644
--- a/src/FixedPointNumbers.jl
+++ b/src/FixedPointNumbers.jl
@@ -85,8 +85,16 @@ widen1(x::Integer) = x % widen1(typeof(x))
 typealias ShortInts Union{Int8,UInt8,Int16,UInt16}
 
 floattype{T<:ShortInts,f}(::Type{FixedPoint{T,f}}) = Float32
-floattype{T,f}(::Type{FixedPoint{T,f}}) = Float64
-floattype(x::FixedPoint) = floattype(supertype(typeof(x)))
+floattype{T<:Integer,f}(::Type{FixedPoint{T,f}}) = Float64
+floattype{F<:FixedPoint}(::Type{F}) = floattype(supertype(F))
+floattype(x::FixedPoint) = floattype(typeof(x))
+
+nbitsfrac{T<:Integer,f}(::Type{FixedPoint{T,f}}) = f
+nbitsfrac{F<:FixedPoint}(::Type{F}) = nbitsfrac(supertype(F))
+
+rawtype{T<:Integer,f}(::Type{FixedPoint{T,f}}) = T
+rawtype{F<:FixedPoint}(::Type{F}) = rawtype(supertype(F))
+rawtype(x::FixedPoint) = rawtype(typeof(x))
 
 # This IOBuffer is used during module definition to generate typealias names
 _iotypealias = IOBuffer()
diff --git a/src/fixed.jl b/src/fixed.jl
index 9662dcef..7cae454f 100644
--- a/src/fixed.jl
+++ b/src/fixed.jl
@@ -10,9 +10,6 @@ end
 
 reinterpret{T<:Signed, f}(::Type{Fixed{T,f}}, x::T) = Fixed{T,f}(x, 0)
 
-  rawtype{T,f}(::Type{Fixed{T,f}}) = T
-nbitsfrac{T,f}(::Type{Fixed{T,f}}) = f
-floattype{T<:Fixed}(::Type{T}) = floattype(supertype(T))
 typechar{X<:Fixed}(::Type{X}) = 'Q'
 signbits{X<:Fixed}(::Type{X}) = 1
 
diff --git a/src/normed.jl b/src/normed.jl
index 416f314e..0bcb517c 100644
--- a/src/normed.jl
+++ b/src/normed.jl
@@ -8,10 +8,6 @@ immutable Normed{T<:Unsigned,f} <: FixedPoint{T,f}
     (::Type{Normed{T, f}}){T, f}(x) = convert(Normed{T,f}, x)
 end
 
-  rawtype{T,f}(::Type{Normed{T,f}}) = T
-  rawtype(x::Number) = rawtype(typeof(x))
-nbitsfrac{T,f}(::Type{Normed{T,f}}) = f
-floattype{T<:Normed}(::Type{T}) = floattype(supertype(T))
 typechar{X<:Normed}(::Type{X}) = 'N'
 signbits{X<:Normed}(::Type{X}) = 0