ast: builder: Add Return expression builder #3386
Merged
+11
−0
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
ast-builder-return
branch
from
02c1983 to
ba18d7b
Compare
gcc/rust/ChangeLog: * ast/rust-ast-builder.h: Declare it. * ast/rust-ast-builder.cc (Builder::return_expr): Define it.
P-E-P
reviewed
Jan 28, 2025
Comment on lines
+220
to
+221
| return std::unique_ptr<Expr> ( | ||
| new ReturnExpr (std::move (to_return), {}, loc)); |
There was a problem hiding this comment.
Couldn't we use make_unique here ? I believe we can even get rid of our implementation since baseline cpp version has been bumped to cpp14.
There was a problem hiding this comment.
tried using it and it complains about not finding a matching constructor:
../../gcc/rust/ast/rust-ast-builder.cc:220:39: error: no matching function for call to ‘make_unique<Rust::AST::ReturnExpr>(std::remove_reference<std::unique_ptr<Rust::AST::Expr>&>::type, <brace-enclosed initializer list>, location_t&)’
220 | return std::make_unique<ReturnExpr> (std::move (to_return), {}, loc);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~but maybe I'm missing something
Comment on lines
+89
to
+90
| std::unique_ptr<Expr> return_expr (std::unique_ptr<Expr> &&to_return | ||
| = nullptr); |
There was a problem hiding this comment.
std::unique_ptr<Expr> && I wish it was an optional instead, this would draw a clear line and we would be able to easily catch rogue null pointers.
There was a problem hiding this comment.
I think we'd need to change the AST for this then, because the ReturnExpr class only keeps a unique_ptr. So the builder's code would look like this:
std::unique_ptr<Expr>
Builder::return_expr (tl::optional<std::unique_ptr<Expr>> &&to_return)
{
if (to_return)
return std::unique_ptr<Expr> (
new ReturnExpr (std::move (*to_return), {}, loc));
return std::unique_ptr<Expr> (new ReturnExpr (nullptr, {}, loc));
}which is quite heavy
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.
Add new methods for building
return <x>;expressions/statements in our AST.