From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Wed, 5 Apr 2023 11:45:36 +0000 (+0200)
Subject: gccrs: ast: Fix StructExprStruct tokenstream
X-Git-Tag: basepoints/gcc-15~2665
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d8de1ca4a78ec7bf9cdd7e5cbe9d11bd2546efe;p=thirdparty%2Fgcc.git

gccrs: ast: Fix StructExprStruct tokenstream

StructExprStructFields inherit from StructExprStruct and shall output
the struct name and curly braces.

gcc/rust/ChangeLog:

	* ast/rust-ast-tokenstream.cc (TokenStream::visit): Add struct
	name and curly braces to output tokenstream.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
---

diff --git a/gcc/rust/ast/rust-ast-tokenstream.cc b/gcc/rust/ast/rust-ast-tokenstream.cc
index 8c54141fd789..cdfd8701c6de 100644
--- a/gcc/rust/ast/rust-ast-tokenstream.cc
+++ b/gcc/rust/ast/rust-ast-tokenstream.cc
@@ -1111,11 +1111,6 @@ void
 TokenStream::visit (StructExprStruct &expr)
 {
   visit (expr.get_struct_name ());
-  tokens.push_back (Rust::Token::make (LEFT_CURLY, expr.get_locus ()));
-  // FIXME: Reference says it should have fields but node doesn't have them for
-  // now. We need to disambiguate with StructExprUnit and visit fields.
-  gcc_unreachable ();
-  tokens.push_back (Rust::Token::make (RIGHT_CURLY, Location ()));
 }
 
 void
@@ -1161,6 +1156,8 @@ TokenStream::visit (StructBase &base)
 void
 TokenStream::visit (StructExprStructFields &expr)
 {
+  visit (expr.get_struct_name ());
+  tokens.push_back (Rust::Token::make (LEFT_CURLY, expr.get_locus ()));
   visit_items_joined_by_separator (expr.get_fields (), COMMA);
   if (expr.has_struct_base ())
     {
@@ -1171,6 +1168,7 @@ TokenStream::visit (StructExprStructFields &expr)
     {
       trailing_comma ();
     }
+  tokens.push_back (Rust::Token::make (RIGHT_CURLY, expr.get_locus ()));
 }
 
 void