[gcc/devel/rust/master] macro_transcriber: Add TYPE context and associated transcriber

[gcc/devel/rust/master] macro_transcriber: Add TYPE context and associated transcriber

[Thomas Schwinge]

https://gcc.gnu.org/g:b6bbf1fa724bada60173ea93c5b604cee9c66da0

commit b6bbf1fa724bada60173ea93c5b604cee9c66da0
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date:   Mon Mar 28 10:35:38 2022 +0200

    macro_transcriber: Add TYPE context and associated transcriber

Diff:
---
 gcc/rust/expand/rust-macro-expand.cc | 16 ++++++++++++++++
 gcc/rust/expand/rust-macro-expand.h  |  1 +
 2 files changed, 17 insertions(+)

diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc
index 2620fea1bb5..852e61920f2 100644
--- a/gcc/rust/expand/rust-macro-expand.cc
+++ b/gcc/rust/expand/rust-macro-expand.cc
@@ -909,6 +909,19 @@ transcribe_expression (Parser<MacroInvocLexer> &parser)
   return {AST::SingleASTNode (std::move (expr))};
 }
 
+/**
+ * Transcribe one type from a macro invocation
+ *
+ * @param parser Parser to extract statements from
+ */
+static std::vector<AST::SingleASTNode>
+transcribe_type (Parser<MacroInvocLexer> &parser)
+{
+  auto expr = parser.parse_type ();
+
+  return {AST::SingleASTNode (std::move (expr))};
+}
+
 static std::vector<AST::SingleASTNode>
 transcribe_on_delimiter (Parser<MacroInvocLexer> &parser, bool semicolon,
 			 AST::DelimType delimiter, TokenId last_token_id)
@@ -957,6 +970,9 @@ transcribe_context (MacroExpander::ContextType ctx,
     case MacroExpander::ContextType::EXTERN:
       return transcribe_many_ext (parser, last_token_id);
       break;
+    case MacroExpander::ContextType::TYPE:
+      return transcribe_type (parser);
+      break;
     default:
       return transcribe_on_delimiter (parser, semicolon, delimiter,
 				      last_token_id);
diff --git a/gcc/rust/expand/rust-macro-expand.h b/gcc/rust/expand/rust-macro-expand.h
index f08525fd4e8..3cac61739a6 100644
--- a/gcc/rust/expand/rust-macro-expand.h
+++ b/gcc/rust/expand/rust-macro-expand.h
@@ -188,6 +188,7 @@ struct MacroExpander
     ITEM,
     BLOCK,
     EXTERN,
+    TYPE,
     TRAIT,
     IMPL,
     TRAIT_IMPL,