Merge #1069

1069: Handle macro invocations in type contexts r=CohenArthur a=CohenArthur

Closes #1067 

This highlighted two issues where parsing types is not entirely correct, which I'll raise. The code necessary to handle macro invocations in these two places should already be implemented. 

Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc
index 2620fea..852e619 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);