Skip to content

Eliminate Compat dependency #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2015
Merged

Eliminate Compat dependency #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16adff3
Commit to 0.4 and eliminate Compat depencency
timholy Oct 28, 2015
786848d
Run ufixed tests first
timholy Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions REQUIRE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
julia 0.4-
Compat 0.2.2
julia 0.4
8 changes: 3 additions & 5 deletions src/FixedPointNumbers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
VERSION >= v"0.4.0-dev+6521" && __precompile__()
__precompile__()

module FixedPointNumbers

using Compat

using Base: IdFun, AddFun, MulFun, reducedim_initarray

import Base: ==, <, <=, -, +, *, /, ~,
Expand Down Expand Up @@ -87,9 +85,9 @@ end
# Particularly useful for arrays.
scaledual(Tdual::Type, x) = one(Tdual), x
scaledual{Tdual<:Number}(b::Tdual, x) = b, x
@compat scaledual{T<:FixedPoint}(Tdual::Type, x::Union{T,AbstractArray{T}}) =
scaledual{T<:FixedPoint}(Tdual::Type, x::Union{T,AbstractArray{T}}) =
convert(Tdual, 1/one(T)), reinterpret(rawtype(T), x)
@compat scaledual{Tdual<:Number, T<:FixedPoint}(b::Tdual, x::Union{T,AbstractArray{T}}) =
scaledual{Tdual<:Number, T<:FixedPoint}(b::Tdual, x::Union{T,AbstractArray{T}}) =
convert(Tdual, b/one(T)), reinterpret(rawtype(T), x)

end # module
2 changes: 1 addition & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
for f in ["fixed.jl", "ufixed.jl"]
for f in ["ufixed.jl", "fixed.jl"]
println("Testing $f")
include(f)
end
2 changes: 1 addition & 1 deletion test/ufixed.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using FixedPointNumbers, Compat, Base.Test
using FixedPointNumbers, Base.Test

@test reinterpret(0xa2uf8) == 0xa2
@test reinterpret(0xa2uf10) == 0xa2
Expand Down