Skip to content

Commit 199da05

Browse files
committed
fix airy function deprecations (follow-up to #18050)
1 parent 6ad62c4 commit 199da05

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

base/deprecated.jl

+14-6
Original file line numberDiff line numberDiff line change
@@ -1280,8 +1280,16 @@ eval(SparseArrays, :(broadcast_zpreserving!(f, C::SparseMatrixCSC, A::Union{Arra
12801280
@deprecate airyx{T<:Number}(x::AbstractArray{T}) airyaix.(x)
12811281
@deprecate airyprime{T<:Number}(x::AbstractArray{T}) airyprime.(x)
12821282

1283+
function airy_depwarn(afn, suf, K, X, broadcast::Bool)
1284+
if broadcast
1285+
msg = "`$afn(k::$K,x::$X)` is deprecated, use `airyai$suf.(x)`, `airyaiprime$suf.(x)`, `airybi$suf.(x)` or `airybiprime$suf.(x)` instead."
1286+
else
1287+
msg = "`$afn(k::$K,x::$X)` is deprecated, use `airyai$suf(x)`, `airyaiprime$suf(x)`, `airybi$suf(x)` or `airybiprime$suf(x)` instead."
1288+
end
1289+
depwarn(msg, Symbol(afn))
1290+
end
1291+
12831292
function _airy(k::Integer, z::Complex128)
1284-
depwarn("`airy(k,x)` is deprecated, use `airyai(x)`, `airyaiprime(x)`, `airybi(x)` or `airybiprime(x)` instead.",:airy)
12851293
id = Int32(k==1 || k==3)
12861294
if k == 0 || k == 1
12871295
return _airy(z, id, Int32(1))
@@ -1291,8 +1299,8 @@ function _airy(k::Integer, z::Complex128)
12911299
throw(ArgumentError("k must be between 0 and 3"))
12921300
end
12931301
end
1302+
12941303
function _airyx(k::Integer, z::Complex128)
1295-
depwarn("`airyx(k,x)` is deprecated, use `airyaix(x)`, `airyaiprimex(x)`, `airybix(x)` or `airybiprimex(x)` instead.",:airyx)
12961304
id = Int32(k==1 || k==3)
12971305
if k == 0 || k == 1
12981306
return _airy(z, id, Int32(2))
@@ -1308,7 +1316,7 @@ for afn in (:airy,:airyx)
13081316
suf = string(afn)[5:end]
13091317
@eval begin
13101318
function $afn(k::Integer, z::Complex128)
1311-
depwarn("`$afn(k,x)` is deprecated, use `airyai$suf(x)`, `airyaiprime$suf(x)`, `airybi$suf(x)` or `airybiprime$suf(x)` instead.",$(QuoteNode(afn)))
1319+
airy_depwarn($afn, $suf, "Number", "Number", false)
13121320
$_afn(k,z)
13131321
end
13141322

@@ -1319,15 +1327,15 @@ for afn in (:airy,:airyx)
13191327
$afn(k::Integer, x::AbstractFloat) = real($afn(k, complex(x)))
13201328

13211329
function $afn{T<:Number}(k::Number, x::AbstractArray{T})
1322-
depwarn("`$afn(k::Number,x::AbstractArray)` is deprecated, use `airyai$suf.(x)`, `airyaiprime$suf.(x)`, `airybi$suf.(x)` or `airybiprime$suf.(x)` instead.",$(QuoteNode(afn)))
1330+
airy_depwarn($afn, $suf, "Number", "AbstractArray", true)
13231331
$_afn.(k,x)
13241332
end
13251333
function $afn{S<:Number}(k::AbstractArray{S}, x::Number)
1326-
depwarn("`$afn(k::AbstractArray,x::AbstractArray)` is deprecated, use `airyai$suf.(x)`, `airyaiprime$suf.(x)`, `airybi$suf.(x)` or `airybiprime$suf.(x)` instead.",$(QuoteNode(afn)))
1334+
airy_depwarn($afn, $suf, "AbstractArray", "Number", true)
13271335
$_afn.(k,x)
13281336
end
13291337
function $afn{S<:Number,T<:Number}(k::AbstractArray{S}, x::AbstractArray{T})
1330-
depwarn("`$afn(k::AbstractArray,x::AbstractArray)` is deprecated, use `airyai$suf.(x)`, `airyaiprime$suf.(x)`, `airybi$suf.(x)` or `airybiprime$suf.(x)` instead.",$(QuoteNode(afn)))
1338+
airy_depwarn($afn, $suf, "AbstractArray", "AbstractArray", true)
13311339
$_afn.(k,x)
13321340
end
13331341
end

0 commit comments

Comments
 (0)