diff options
| author | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-12-31 17:36:50 +0000 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2025-01-16 14:00:31 +0000 |
| commit | b8eb6cd44753940f312db3d42ba7c2e6a0a57dbd (patch) | |
| tree | b971aa1b51236ef9101414cc8d0380fc63f0f3b3 /gcc | |
| parent | 115df226360e769eefb5acc2a1f367e300546bdf (diff) | |
| download | gcc-b8eb6cd44753940f312db3d42ba7c2e6a0a57dbd.zip gcc-b8eb6cd44753940f312db3d42ba7c2e6a0a57dbd.tar.gz gcc-b8eb6cd44753940f312db3d42ba7c2e6a0a57dbd.tar.bz2 | |
ast-collector: Adapt to lang item type path segments
gcc/rust/ChangeLog:
* ast/rust-ast-collector.cc (TokenCollector::visit): Fix collector to better
handle lang item type path segments.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/ast/rust-ast-collector.cc | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/gcc/rust/ast/rust-ast-collector.cc b/gcc/rust/ast/rust-ast-collector.cc index d9ebaee..32e021c4 100644 --- a/gcc/rust/ast/rust-ast-collector.cc +++ b/gcc/rust/ast/rust-ast-collector.cc @@ -543,10 +543,14 @@ TokenCollector::visit (TypePathSegment &segment) { // Syntax: // PathIdentSegment - auto ident_segment = segment.get_ident_segment (); - auto id = ident_segment.as_string (); - push ( - Rust::Token::make_identifier (ident_segment.get_locus (), std::move (id))); + + auto locus = segment.is_lang_item () + ? segment.get_locus () + : segment.get_ident_segment ().get_locus (); + auto segment_string = segment.is_lang_item () + ? LangItem::PrettyString (segment.get_lang_item ()) + : segment.get_ident_segment ().as_string (); + push (Rust::Token::make_identifier (locus, std::move (segment_string))); } void @@ -558,10 +562,13 @@ TokenCollector::visit (TypePathSegmentGeneric &segment) // `<` `>` // | `<` ( GenericArg `,` )* GenericArg `,`? `>` - auto ident_segment = segment.get_ident_segment (); - auto id = ident_segment.as_string (); - push ( - Rust::Token::make_identifier (ident_segment.get_locus (), std::move (id))); + auto locus = segment.is_lang_item () + ? segment.get_locus () + : segment.get_ident_segment ().get_locus (); + auto segment_string = segment.is_lang_item () + ? LangItem::PrettyString (segment.get_lang_item ()) + : segment.get_ident_segment ().as_string (); + push (Rust::Token::make_identifier (locus, std::move (segment_string))); if (segment.get_separating_scope_resolution ()) push (Rust::Token::make (SCOPE_RESOLUTION, UNDEF_LOCATION)); |