derive(PartialEq): Add partial implementation (hehe) #3415
+998
−56
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CohenArthur
force-pushed
the
derive-partialeq-eq
branch
4 times, most recently
from
7243ef7 to
d50fc0c
Compare
gcc/rust/ChangeLog: * expand/rust-derive.cc (DeriveVisitor::derive): Call into DeriveEq. * expand/rust-derive-eq.cc: New file. * expand/rust-derive-eq.h: New file. * Make-lang.in: Compile them. gcc/testsuite/ChangeLog: * rust/compile/derive-eq-invalid.rs: New test.
gcc/rust/ChangeLog: * ast/rust-ast-builder.cc (Builder::block): Change return type. (Builder::loop): Use new APIs. * ast/rust-ast-builder.h: Change return type of block functions.
gcc/rust/ChangeLog: * ast/rust-ast-builder.cc (Builder::literal_bool): New method. (Builder::comparison_expr): Likewise. (Builder::boolean_operation): Likewise. * ast/rust-ast-builder.h: Declare them.
gcc/rust/ChangeLog: * expand/rust-derive-clone.cc: Cleanup implementation, avoid repetitions. * expand/rust-derive-clone.h: Likewise.
We are still missing some deriving for enums, as part of our codegen and nameres for rebinding struct field patterns is missing. gcc/rust/ChangeLog: * expand/rust-derive-partial-eq.cc: New file. * expand/rust-derive-partial-eq.h: New file. * expand/rust-derive.cc (DeriveVisitor::derive): Call them. * Make-lang.in: Compile them. gcc/testsuite/ChangeLog: * rust/compile/derive-eq-invalid.rs: Mark PartialEq def as a lang item. * rust/compile/derive-partialeq1.rs: New test. * rust/execute/torture/derive-partialeq1.rs: New test. * rust/compile/nr2/exclude: Exclude all of them.
gcc/rust/ChangeLog: * expand/rust-derive.cc (DeriveVisitor::derive): Return a vector of items. * expand/rust-derive.h: Change return type. * expand/rust-expand-visitor.cc: Insert all generated items into the AST.
CohenArthur
force-pushed
the
derive-partialeq-eq
branch
from
d50fc0c to
b9c5bdf
Compare
gcc/rust/ChangeLog: * expand/rust-derive-partial-eq.cc: Adapt signatures to generate two impls. * expand/rust-derive-partial-eq.h: Likewise. * expand/rust-derive.cc (DeriveVisitor::derive): Adapt to multiple item generation. gcc/testsuite/ChangeLog: * rust/compile/derive-eq-invalid.rs: Declare StructuralPartialEq. * rust/compile/derive-partialeq1.rs: Likewise. * rust/execute/torture/derive-partialeq1.rs: Likewise.
gcc/rust/ChangeLog: * expand/rust-derive-eq.cc: Adapt functions to return two generated impls. * expand/rust-derive-eq.h: Likewise. * expand/rust-derive.cc (DeriveVisitor::derive): Likewise.
CohenArthur
force-pushed
the
derive-partialeq-eq
branch
from
b9c5bdf to
741e633
Compare
P-E-P
requested changes
Feb 7, 2025
| std::unique_ptr<Expr> | ||
| Builder::literal_bool (bool b) const | ||
| { | ||
| auto str = b ? "true" : "false"; |
There was a problem hiding this comment.
We should probably use the keyword value from rust-keyword-values.h.
| std::unique_ptr<AssociatedItem> &&fn, std::string name, | ||
| const std::vector<std::unique_ptr<GenericParam>> &type_generics) | ||
| { | ||
| auto eq = builder.type_path ({"core", "cmp", "Eq"}, true); |
There was a problem hiding this comment.
Should we make this path (or individual segments) available globally like weak keywords ?
| // nothing to do as they contain no inner types | ||
| continue; | ||
| case EnumItem::Kind::Tuple: { | ||
| auto tuple = static_cast<EnumItemTuple &> (*variant); |
There was a problem hiding this comment.
We want to avoid the copy here auto &tuple = static_cast<EnumItemTuple &> (*variant);.
| break; | ||
| } | ||
| case EnumItem::Kind::Struct: { | ||
| auto tuple = static_cast<EnumItemStruct &> (*variant); |
| @@ -0,0 +1,313 @@ | |||
| // Copyright (C) 2020-2024 Free Software Foundation, Inc. | |||
There was a problem hiding this comment.
Date range is incorrect, should be 2025 instead of 2020-2024.
| auto block = builder.block (tl::nullopt, std::move (cmp_expression)); | ||
|
|
||
| auto self_type | ||
| = std::unique_ptr<TypeNoBounds> (new TypePath (builder.type_path ("Self"))); |
There was a problem hiding this comment.
We may use rust-keyword-values.h, unsure if it would make it more readable though.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2992
This adds a base for deriving
PartialEqandEqbut misses some more complex stuff like struct enum items, as we need to add more to our nameres and codegen to handle these rebinding patterns.We also need to rework this part of the expansion pass asthis is now done in this PR.derive(Eq)andderive(PartialEq)should both create two impls: one of their trait, and one of the associatedStructural*traitThis is ready for reviewing and merging IMO as a first basic implementation of
derive(PartialEq)even if it does not support all types of Rust enums