gccrs: ast: Add Meta items TokenStream visitor

Add visitor implementation for all remaining meta items.

gcc/rust/ChangeLog:

	* ast/rust-ast-tokenstream.cc (TokenStream::visit): Add visitor
	implementation.
	* ast/rust-ast-tokenstream.h: Add additional function prototype.
	* ast/rust-item.h: Add some getters.
	* ast/rust-macro.h: Likewise.

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 9fb9f931202451b9846477ce7c318a033181212b..1bc1cab58c0d71d1bda6b6657492918f127622f0 100644 (file)
--- a/gcc/rust/ast/rust-ast-tokenstream.cc
+++ b/gcc/rust/ast/rust-ast-tokenstream.cc
@@ -2047,8 +2047,22 @@ TokenStream::visit (ExternalTypeItem &type)
 }
 
 void
-TokenStream::visit (ExternalStaticItem &)
-{}
+TokenStream::visit (ExternalStaticItem &item)
+{
+  auto id = item.get_identifier ();
+  visit_items_as_lines (item.get_outer_attrs ());
+  if (item.has_visibility ())
+    visit (item.get_visibility ());
+  tokens.push_back (Rust::Token::make (STATIC_TOK, item.get_locus ()));
+  if (item.is_mut ())
+    tokens.push_back (Rust::Token::make (MUT, Location ()));
+  tokens.push_back (Rust::Token::make_identifier (Location (), std::move (id)));
+  tokens.push_back (Rust::Token::make (COLON, Location ()));
+  visit (item.get_type ());
+  // TODO: No expr ? The "(= Expression)?" part from the reference seems missing
+  // in the ast.
+  tokens.push_back (Rust::Token::make (SEMICOLON, Location ()));
+}
 
 void
 TokenStream::visit (ExternalFunctionItem &function)
@@ -2188,32 +2202,77 @@ TokenStream::visit (MacroRulesDefinition &rules_def)
 }
 
 void
-TokenStream::visit (MacroInvocation &)
-{}
+TokenStream::visit (MacroInvocation &invocation)
+{
+  auto data = invocation.get_invoc_data ();
+  visit (data.get_path ());
+  tokens.push_back (Rust::Token::make (EXCLAM, Location ()));
+  visit (data.get_delim_tok_tree ());
+  if (invocation.has_semicolon ())
+    tokens.push_back (Rust::Token::make (SEMICOLON, Location ()));
+}
 
 void
-TokenStream::visit (MetaItemPath &)
-{}
+TokenStream::visit (MetaItemPath &item)
+{
+  auto path = item.to_path_item ();
+  visit (path);
+}
 
 void
-TokenStream::visit (MetaItemSeq &)
-{}
+TokenStream::visit (MetaItemSeq &item)
+{
+  visit (item.get_path ());
+  // TODO: Double check this, there is probably a mistake.
+  tokens.push_back (Rust::Token::make (LEFT_PAREN, Location ()));
+  visit_items_joined_by_separator (item.get_seq (), COMMA);
+  tokens.push_back (Rust::Token::make (RIGHT_PAREN, Location ()));
+}
 
 void
-TokenStream::visit (MetaWord &)
-{}
+TokenStream::visit (MetaWord &word)
+{
+  auto id = word.get_ident ();
+  tokens.push_back (
+    Rust::Token::make_identifier (word.get_locus (), std::move (id)));
+}
 
 void
-TokenStream::visit (MetaNameValueStr &)
-{}
+TokenStream::visit (MetaNameValueStr &name)
+{
+  auto pair = name.get_name_value_pair ();
+  auto id = std::get<0> (pair);
+  auto value = std::get<1> (pair);
+  tokens.push_back (
+    Rust::Token::make_identifier (name.get_locus (), std::move (id)));
+  tokens.push_back (Rust::Token::make (EQUAL, name.get_locus ()));
+  tokens.push_back (Rust::Token::make (DOUBLE_QUOTE, Location ()));
+  tokens.push_back (
+    Rust::Token::make_identifier (name.get_locus (), std::move (value)));
+  tokens.push_back (Rust::Token::make (DOUBLE_QUOTE, Location ()));
+}
 
 void
-TokenStream::visit (MetaListPaths &)
-{}
+TokenStream::visit (MetaListPaths &list)
+{
+  auto id = list.get_ident ();
+  tokens.push_back (
+    Rust::Token::make_identifier (list.get_locus (), std::move (id)));
+  tokens.push_back (Rust::Token::make (LEFT_PAREN, Location ()));
+  visit_items_joined_by_separator (list.get_paths (), COMMA);
+  tokens.push_back (Rust::Token::make (RIGHT_PAREN, Location ()));
+}
 
 void
-TokenStream::visit (MetaListNameValueStr &)
-{}
+TokenStream::visit (MetaListNameValueStr &list)
+{
+  auto id = list.get_ident ();
+  tokens.push_back (
+    Rust::Token::make_identifier (list.get_locus (), std::move (id)));
+  tokens.push_back (Rust::Token::make (LEFT_PAREN, Location ()));
+  visit_items_joined_by_separator (list.get_values (), COMMA);
+  tokens.push_back (Rust::Token::make (RIGHT_PAREN, Location ()));
+}
 
 // rust-pattern.h
 void

diff --git a/gcc/rust/ast/rust-ast-tokenstream.h b/gcc/rust/ast/rust-ast-tokenstream.h
index bf3e0b2cf6aa3f4a847013d9a3327c8c8f93c2d9..1c9328e7dbe5360a03df99ab1d09c013fa013f0c 100644 (file)
--- a/gcc/rust/ast/rust-ast-tokenstream.h
+++ b/gcc/rust/ast/rust-ast-tokenstream.h
@@ -245,6 +245,7 @@ private:
   void visit (MacroMatchRepetition &match);
   void visit (MacroMatcher &matcher);
   void visit (MacroRulesDefinition &rules_def);
+  void visit (MacroInvocData &invoc_data);
   void visit (MacroInvocation &macro_invoc);
   void visit (MetaItemPath &meta_item);
   void visit (MetaItemSeq &meta_item);

diff --git a/gcc/rust/ast/rust-item.h b/gcc/rust/ast/rust-item.h
index e08a35234a85f1a7bf9236f4796d37e58ae147ee..ec2bbe80067f022abbda34ff0242cda1d9679328 100644 (file)
--- a/gcc/rust/ast/rust-item.h
+++ b/gcc/rust/ast/rust-item.h
@@ -4087,6 +4087,8 @@ public:
 
   Identifier get_identifier () const { return item_name; }
 
+  Visibility &get_visibility () { return visibility; }
+
   const Visibility &get_visibility () const { return visibility; }
 
   bool is_mut () const { return has_mut; }

diff --git a/gcc/rust/ast/rust-macro.h b/gcc/rust/ast/rust-macro.h
index 2ea42e451ad2c01d54c87d8397ee4f4bb095d1a7..e6fcb81a8a69aa2da91f5066ae764088604db63e 100644 (file)
--- a/gcc/rust/ast/rust-macro.h
+++ b/gcc/rust/ast/rust-macro.h
@@ -904,6 +904,10 @@ public:
 
   std::string as_string () const override;
 
+  SimplePath &get_path () { return path; }
+
+  std::vector<std::unique_ptr<MetaItemInner>> &get_seq () { return seq; }
+
   void accept_vis (ASTVisitor &vis) override;
 
   Location get_locus () const override { return path.get_locus (); }
@@ -935,6 +939,8 @@ public:
 
   void accept_vis (ASTVisitor &vis) override;
 
+  Identifier get_ident () const { return ident; }
+
   Location get_locus () const override { return ident_locus; }
 
   bool check_cfg_predicate (const Session &session) const override;
@@ -1019,6 +1025,10 @@ public:
 
   void accept_vis (ASTVisitor &vis) override;
 
+  Identifier get_ident () const { return ident; }
+
+  std::vector<SimplePath> &get_paths () { return paths; };
+
   Location get_locus () const override { return ident_locus; }
 
   bool check_cfg_predicate (const Session &session) const override;
@@ -1055,6 +1065,10 @@ public:
 
   void accept_vis (ASTVisitor &vis) override;
 
+  Identifier get_ident () { return ident; }
+
+  std::vector<MetaNameValueStr> &get_values () { return strs; }
+
   Location get_locus () const override { return ident_locus; }
 
   bool check_cfg_predicate (const Session &session) const override;