https://gcc.gnu.org/g:8dedd0d11ddb3c999530edf6c810b1aa7ca7378b
commit r15-8637-g8dedd0d11ddb3c999530edf6c810b1aa7ca7378b
Author: Arthur Cohen <arthur.co...@embecosm.com>
Date: Fri Jan 3 14:27:38 2025 +0000
gccrs: ast-builder: Add new methods for building structs
gcc/rust/ChangeLog:
* ast/rust-ast-builder.cc: Add new methods for constructing struct
exprs.
* ast/rust-ast-builder.h: Mention how to build tuple expressions.
Diff:
---
gcc/rust/ast/rust-ast-builder.cc | 12 ++++++++++--
gcc/rust/ast/rust-ast-builder.h | 5 +++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/gcc/rust/ast/rust-ast-builder.cc b/gcc/rust/ast/rust-ast-builder.cc
index fe80924fece7..47044df91714 100644
--- a/gcc/rust/ast/rust-ast-builder.cc
+++ b/gcc/rust/ast/rust-ast-builder.cc
@@ -24,6 +24,7 @@
#include "rust-path.h"
#include "rust-item.h"
#include "rust-path.h"
+#include "rust-system.h"
#include "rust-token.h"
namespace Rust {
@@ -261,10 +262,17 @@ std::unique_ptr<Expr>
Builder::struct_expr (
std::string struct_name,
std::vector<std::unique_ptr<StructExprField>> &&fields) const
+{
+ return struct_expr (path_in_expression ({struct_name}), std::move (fields));
+}
+
+std::unique_ptr<Expr>
+Builder::struct_expr (
+ PathInExpression struct_name,
+ std::vector<std::unique_ptr<StructExprField>> &&fields) const
{
return std::unique_ptr<Expr> (
- new StructExprStructFields (path_in_expression ({struct_name}),
- std::move (fields), loc));
+ new StructExprStructFields (struct_name, std::move (fields), loc));
}
std::unique_ptr<StructExprField>
diff --git a/gcc/rust/ast/rust-ast-builder.h b/gcc/rust/ast/rust-ast-builder.h
index 624cd715181d..e5bae6ed6e95 100644
--- a/gcc/rust/ast/rust-ast-builder.h
+++ b/gcc/rust/ast/rust-ast-builder.h
@@ -160,10 +160,15 @@ public:
/**
* Create an expression for struct instantiation with fields (`S { a, b: c
}`)
+ * Tuple expressions are call expressions and can thus be constructed with
+ * `call`
*/
std::unique_ptr<Expr>
struct_expr (std::string struct_name,
std::vector<std::unique_ptr<StructExprField>> &&fields) const;
+ std::unique_ptr<Expr>
+ struct_expr (PathInExpression struct_name,
+ std::vector<std::unique_ptr<StructExprField>> &&fields) const;
/* Create a field expression for struct instantiation (`field_name: value`)
*/
std::unique_ptr<StructExprField>
