diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2023-04-05 13:45:36 +0200 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2023-04-14 12:34:44 +0000 |
| commit | ac79c65365bdbcee00916e3785fd6bb8aeee0ba2 (patch) | |
| tree | f840076b722f10fc8391d11c1cf9e53a841a38f8 /gcc | |
| parent | 37d4fa770ff751381db8f4fe225bf9e4ec22be56 (diff) | |
| download | gcc-ac79c65365bdbcee00916e3785fd6bb8aeee0ba2.zip gcc-ac79c65365bdbcee00916e3785fd6bb8aeee0ba2.tar.gz gcc-ac79c65365bdbcee00916e3785fd6bb8aeee0ba2.tar.bz2 | |
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>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/ast/rust-ast-tokenstream.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gcc/rust/ast/rust-ast-tokenstream.cc b/gcc/rust/ast/rust-ast-tokenstream.cc index 8c54141..cdfd870 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 |