Skip to content
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

some type safety for Fix #57314

Closed
wants to merge 2 commits into from
Closed

some type safety for Fix #57314

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
f8fb3a6
some type safety for `Fix`
nsajko Feb 8, 2025
eaa8a83
add test
nsajko Feb 8, 2025
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
14 changes: 6 additions & 8 deletions base/operators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,17 +1170,15 @@ A type representing a partially-applied version of a function `f`, with the argu
`Fix{1}(Fix{2}(f, 4), 4)` fixes the first and second arg, while `Fix{2}(Fix{1}(f, 4), 4)`
fixes the first and third arg.
"""
struct Fix{N,F,T} <: Function
struct Fix{N,F,T,NTuple{N,Nothing}<:NTup<:NTuple{N,Nothing}} <: Function
f::F
x::T

function Fix{N}(f::F, x) where {N,F}
if !(N isa Int)
throw(ArgumentError(LazyString("expected type parameter in `Fix` to be `Int`, but got `", N, "::", typeof(N), "`")))
elseif N < 1
throw(ArgumentError(LazyString("expected `N` in `Fix{N}` to be integer greater than 0, but got ", N)))
if N < 1
throw(ArgumentError("expected `N` in `Fix{N}` to be integer greater than 0, but got 0"))
end
new{N,_stable_typeof(f),_stable_typeof(x)}(f, x)
new{N,_stable_typeof(f),_stable_typeof(x),NTuple{N,Nothing}}(f, x)
end
end

Expand All @@ -1196,12 +1194,12 @@ end
"""
Alias for `Fix{1}`. See [`Fix`](@ref Base.Fix).
"""
const Fix1{F,T} = Fix{1,F,T}
const Fix1{F,T} = Fix{1,F,T,NTuple{1,Nothing}}

"""
Alias for `Fix{2}`. See [`Fix`](@ref Base.Fix).
"""
const Fix2{F,T} = Fix{2,F,T}
const Fix2{F,T} = Fix{2,F,T,NTuple{2,Nothing}}


"""
Expand Down
7 changes: 5 additions & 2 deletions test/functional.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,12 @@ end
@test f() == 'a'
end
@testset "Dummy-proofing" begin
@test_throws TypeError Fix{Int}
@test_throws TypeError Fix{1, <:Any, <:Any, Union{}}
@test_throws Exception Fix{-1}
@test_throws ArgumentError("expected `N` in `Fix{N}` to be integer greater than 0, but got 0") Fix{0}(>, 1)
@test_throws ArgumentError("expected type parameter in `Fix` to be `Int`, but got `0.5::Float64`") Fix{0.5}(>, 1)
@test_throws ArgumentError("expected type parameter in `Fix` to be `Int`, but got `1::UInt64`") Fix{UInt64(1)}(>, 1)
@test_throws TypeError Fix{0.5}
@test_throws TypeError Fix{UInt64(1)}
end
@testset "Specialize to structs not in `Base`" begin
struct MyStruct
Expand Down