Skip to content

Commit

Permalink
Merge pull request #21226 from JuliaLang/ksh/valexp
Browse files Browse the repository at this point in the history
Fix bugs for x^Val and add tests
  • Loading branch information
kshyatt authored Apr 2, 2017
2 parents ec1dbd1 + f5e5ea5 commit 1f4f4fb
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 8 deletions.
3 changes: 0 additions & 3 deletions base/gmp.jl
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,6 @@ end
^(x::Integer, y::BigInt ) = bigint_pow(BigInt(x), y)
^(x::Bool , y::BigInt ) = Base.power_by_squaring(x, y)

# override default inlining of x^2 and x^3 etc.
^{p}(x::BigInt, ::Type{Val{p}}) = x^p

function powermod(x::BigInt, p::BigInt, m::BigInt)
r = BigInt()
ccall((:__gmpz_powm, :libgmp), Void,
Expand Down
1 change: 0 additions & 1 deletion base/irrationals.jl
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ catalan
for T in (Irrational, Rational, Integer, Number)
^(::Irrational{:e}, x::T) = exp(x)
end
^{p}(::Irrational{:e}, ::Type{Val{p}}) = exp(p)

log(::Irrational{:e}) = 1 # use 1 to correctly promote expressions like log(x)/log(e)
log(::Irrational{:e}, x::Number) = log(x)
Expand Down
2 changes: 1 addition & 1 deletion base/math.jl
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ end
@inline ^(x::Float64, y::Integer) = x ^ Float64(y)
@inline ^(x::Float32, y::Integer) = x ^ Float32(y)
@inline ^(x::Float16, y::Integer) = Float16(Float32(x) ^ Float32(y))
@inline ^{p}(x::Float16, ::Type{Val{p}}) = Float16(Float32(x) ^ Val{p})
@inline literal_pow{p}(::typeof(^), x::Float16, ::Type{Val{p}}) = Float16(literal_pow(^,Float32(x),Val{p}))

function angle_restrict_symm(theta)
const P1 = 4 * 7.8539812564849853515625e-01
Expand Down
3 changes: 0 additions & 3 deletions base/mpfr.jl
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,6 @@ end
^(x::BigFloat, y::Integer) = typemin(Clong) <= y <= typemax(Clong) ? x^Clong(y) : x^BigInt(y)
^(x::BigFloat, y::Unsigned) = typemin(Culong) <= y <= typemax(Culong) ? x^Culong(y) : x^BigInt(y)

# override default inlining of x^2 etc.
^{p}(x::BigFloat, ::Type{Val{p}}) = x^p

for f in (:exp, :exp2, :exp10, :expm1, :cosh, :sinh, :tanh, :sech, :csch, :coth, :cbrt)
@eval function $f(x::BigFloat)
z = BigFloat()
Expand Down
1 change: 1 addition & 0 deletions test/float16.jl
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ g = Float16(1.)
@test f*g === Float16(2f0)
@test f/g === Float16(2f0)
@test f^g === Float16(2f0)
@test f^1 === Float16(2f0)
@test f^-g === Float16(0.5f0)

@test f + 2 === Float16(4f0)
Expand Down
1 change: 1 addition & 0 deletions test/math.jl
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ end
yi = 4
@testset "Random values" begin
@test x^y big(x)^big(y)
@test x^1 === x
@test x^yi big(x)^yi
@test acos(x) acos(big(x))
@test acosh(1+x) acosh(big(1+x))
Expand Down

0 comments on commit 1f4f4fb

Please sign in to comment.