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

Use common methods for Base functions instead of generating #103

Merged
merged 8 commits into from
Oct 3, 2023
Merged

Use common methods for Base functions instead of generating #103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aec72ce
Use common methods for Base functions instead of generating
ararslan Sep 29, 2023
639ec14
Don't test hash value directly
ararslan Sep 29, 2023
ee86e09
Add (nearly) exact test case from issue 101
ararslan Sep 29, 2023
5d12993
This is honestly pretty cursed but hear me out
ararslan Sep 30, 2023
88288f5
Use Legolas functions instead of Base internals
ararslan Sep 30, 2023
c7792de
Simplify further
ararslan Sep 30, 2023
2cf0556
Make tests better
ararslan Oct 2, 2023
1d054bd
Better formatted tests + add parent/child equality tests
ararslan Oct 2, 2023
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
15 changes: 11 additions & 4 deletions src/schemas.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,12 +856,19 @@ end
##### Base overload definitions
#####

function Base.:(==)(x::T, y::T) where {T<:AbstractRecord}
return all(i -> getfield(x, i) == getfield(y, i), 1:fieldcount(T))
_typeof(r::AbstractRecord) = Base.unwrap_unionall(Base.typename(typeof(r)).wrapper)
ararslan marked this conversation as resolved.
Show resolved Hide resolved

_type_equal(x::R, y::R) where {R<:AbstractRecord} = true
_type_equal(x::AbstractRecord, y::AbstractRecord) = _typeof(x) === _typeof(y)

function Base.:(==)(x::AbstractRecord, y::AbstractRecord)
_type_equal(x, y) || return false
return all(i -> getfield(x, i) == getfield(y, i), 1:nfields(x))
end

function Base.isequal(x::T, y::T) where {T<:AbstractRecord}
return all(i -> isequal(getfield(x, i), getfield(y, i)), 1:fieldcount(T))
function Base.isequal(x::AbstractRecord, y::AbstractRecord)
_type_equal(x, y) || return false
return all(i -> isequal(getfield(x, i), getfield(y, i)), 1:nfields(x))
end

function Base.hash(r::AbstractRecord, h::UInt)
Expand Down
2 changes: 2 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,8 @@ end
@test hash(c) isa UInt # NOTE: can't rely on particular values
@test UnionMissingV1(; a=missing, b=1) != UnionMissingV1(; a=missing, b=2)
@test !isequal(UnionMissingV1(; a=missing, b=1), UnionMissingV1(; a=missing, b=2))
@test ParamV1(; i=one(Int32)) == ParamV1(; i=one(Int64))
@test isequal(ParamV1(; i=one(Int32)), ParamV1(; i=one(Int64)))
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should add some tests comparing ChildV1 to a ParentV1 and a ParentV1 to a ChildV1. In particuar I am thinking about _compare_fields(eq, ::AbstractRecord, ::AbstractRecord)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is what I just added what you had in mind?

end

Expand Down