gccrs: ast: Add ExternalTypeItem node

gcc/rust/ChangeLog:

	* ast/rust-item.h (class ExternalTypeItem): New class.
	* ast/rust-ast.cc (ExternalTypeItem::as_string): New function.
	(ExternalTypeItem::accept_vis): Likewise.
	* ast/rust-ast-full-decls.h (class ExternalTypeItem): Declare class.
	* ast/rust-ast-dump.cc (Dump::visit): Add base visitor for ExternalTypeItem.
	* ast/rust-ast-dump.h: Likewise.
	* ast/rust-ast-visitor.h: Likewise.
	* checks/errors/rust-feature-gate.h: Likewise.
	* expand/rust-attribute-visitor.cc (AttrVisitor::visit): Likewise.
	* expand/rust-attribute-visitor.h: Likewise.
	* hir/rust-ast-lower-base.cc (ASTLoweringBase::visit): Likewise.
	* hir/rust-ast-lower-base.h: Likewise.
	* resolve/rust-ast-resolve-base.cc (ResolverBase::visit): Likewise.
	* resolve/rust-ast-resolve-base.h: Likewise.
	* resolve/rust-early-name-resolver.cc (EarlyNameResolver::visit): Likewise.
	* resolve/rust-early-name-resolver.h: Likewise.
	* util/rust-attributes.cc (AttributeChecker::visit): Likewise.
	* util/rust-attributes.h: Likewise.

diff --git a/gcc/rust/ast/rust-ast-dump.cc b/gcc/rust/ast/rust-ast-dump.cc
index a581c029e04fe620294c50b3ad16830afba71b34..a5fce67fda2b606c283aadaad622ba9902e7ca21 100644 (file)
--- a/gcc/rust/ast/rust-ast-dump.cc
+++ b/gcc/rust/ast/rust-ast-dump.cc
@@ -1432,6 +1432,10 @@ Dump::visit (TraitImpl &impl)
   stream << "\n}\n";
 }
 
+void
+Dump::visit (ExternalTypeItem &type)
+{}
+
 void
 Dump::visit (ExternalStaticItem &)
 {}

diff --git a/gcc/rust/ast/rust-ast-dump.h b/gcc/rust/ast/rust-ast-dump.h
index ea3e6f3a896cef41fb359aee446f99b40235184b..a6adab9990f00929c55817f13b131c07a57814c4 100644 (file)
--- a/gcc/rust/ast/rust-ast-dump.h
+++ b/gcc/rust/ast/rust-ast-dump.h
@@ -251,6 +251,7 @@ private:
   void visit (Trait &trait);
   void visit (InherentImpl &impl);
   void visit (TraitImpl &impl);
+  void visit (ExternalTypeItem &item);
   void visit (ExternalStaticItem &item);
   void visit (ExternalFunctionItem &item);
   void visit (ExternBlock &block);

diff --git a/gcc/rust/ast/rust-ast-full-decls.h b/gcc/rust/ast/rust-ast-full-decls.h
index 96a6f22ecd1de6ec4ded0535c26a5ee1647150be..352c1b97c4e8ebd9c88a5137186a939065ac586d 100644 (file)
--- a/gcc/rust/ast/rust-ast-full-decls.h
+++ b/gcc/rust/ast/rust-ast-full-decls.h
@@ -203,6 +203,7 @@ class Impl;
 class InherentImpl;
 class TraitImpl;
 class ExternalItem;
+class ExternalTypeItem;
 class ExternalStaticItem;
 struct NamedFunctionParam;
 class ExternalFunctionItem;

diff --git a/gcc/rust/ast/rust-ast-visitor.h b/gcc/rust/ast/rust-ast-visitor.h
index 9cde911ffe2f1f1eb22e0f997077bd1584e05825..776e1e281f2242806a8f025183ecaa0bd89316eb 100644 (file)
--- a/gcc/rust/ast/rust-ast-visitor.h
+++ b/gcc/rust/ast/rust-ast-visitor.h
@@ -161,6 +161,7 @@ public:
   virtual void visit (InherentImpl &impl) = 0;
   virtual void visit (TraitImpl &impl) = 0;
   // virtual void visit(ExternalItem& item) = 0;
+  virtual void visit (ExternalTypeItem &type) = 0;
   virtual void visit (ExternalStaticItem &item) = 0;
   virtual void visit (ExternalFunctionItem &item) = 0;
   virtual void visit (ExternBlock &block) = 0;

diff --git a/gcc/rust/ast/rust-ast.cc b/gcc/rust/ast/rust-ast.cc
index 6692505454fabed5eb106641707cb9cd747002f3..13d31cf63d47b873c165cd95d9e6fe9563bc6d9a 100644 (file)
--- a/gcc/rust/ast/rust-ast.cc
+++ b/gcc/rust/ast/rust-ast.cc
@@ -3406,6 +3406,16 @@ EnumItemDiscriminant::as_string () const
   return str;
 }
 
+std::string
+ExternalTypeItem::as_string () const
+{
+  auto str = append_attributes (outer_attrs, OUTER);
+
+  str += "type " + item_name + ";";
+
+  return str;
+}
+
 std::string
 ExternalStaticItem::as_string () const
 {
@@ -5492,6 +5502,12 @@ TraitImpl::accept_vis (ASTVisitor &vis)
   vis.visit (*this);
 }
 
+void
+ExternalTypeItem::accept_vis (ASTVisitor &vis)
+{
+  vis.visit (*this);
+}
+
 void
 ExternalStaticItem::accept_vis (ASTVisitor &vis)
 {

diff --git a/gcc/rust/ast/rust-item.h b/gcc/rust/ast/rust-item.h
index 43853232ae868f75ad62147b24fc4ab79c9a314b..2abf7810614de3bdf71a38c2305a87e25d2c3140 100644 (file)
--- a/gcc/rust/ast/rust-item.h
+++ b/gcc/rust/ast/rust-item.h
@@ -3907,6 +3907,81 @@ protected:
 };
 #endif
 
+// A foreign type defined outside the current crate.
+// https://rust-lang.github.io/rfcs/1861-extern-types.html
+class ExternalTypeItem : public ExternalItem
+{
+  std::vector<Attribute> outer_attrs;
+
+  Visibility visibility;
+  Identifier item_name;
+  Location locus;
+
+  bool marked_for_strip;
+
+public:
+  ExternalTypeItem (Identifier item_name, Visibility vis,
+                   std::vector<Attribute> outer_attrs, Location locus)
+    : ExternalItem (), outer_attrs (std::move (outer_attrs)), visibility (vis),
+      item_name (std::move (item_name)), locus (locus), marked_for_strip (false)
+  {}
+
+  ExternalTypeItem (ExternalTypeItem const &other)
+    : outer_attrs (other.outer_attrs), visibility (other.visibility),
+      item_name (other.item_name), locus (other.locus),
+      marked_for_strip (other.marked_for_strip)
+  {
+    node_id = other.node_id;
+  }
+
+  ExternalTypeItem &operator= (ExternalTypeItem const &other)
+  {
+    node_id = other.node_id;
+    outer_attrs = other.outer_attrs;
+    visibility = other.visibility;
+    item_name = other.item_name;
+    locus = other.locus;
+    marked_for_strip = other.marked_for_strip;
+
+    return *this;
+  }
+
+  // move constructors
+  ExternalTypeItem (ExternalTypeItem &&other) = default;
+  ExternalTypeItem &operator= (ExternalTypeItem &&other) = default;
+
+  std::string as_string () const override;
+
+  void accept_vis (ASTVisitor &vis) override;
+
+  // Returns whether item has outer attributes.
+  bool has_outer_attrs () const { return !outer_attrs.empty (); }
+
+  // Returns whether item has non-default visibility.
+  bool has_visibility () const { return !visibility.is_error (); }
+
+  Location get_locus () const { return locus; }
+
+  void mark_for_strip () override { marked_for_strip = true; };
+  bool is_marked_for_strip () const override { return marked_for_strip; };
+
+  // TODO: this mutable getter seems really dodgy. Think up better way.
+  std::vector<Attribute> &get_outer_attrs () { return outer_attrs; }
+  const std::vector<Attribute> &get_outer_attrs () const { return outer_attrs; }
+
+  Identifier get_identifier () const { return item_name; }
+
+  const Visibility &get_visibility () const { return visibility; }
+
+protected:
+  /* Use covariance to implement clone function as returning this object
+   * rather than base */
+  ExternalTypeItem *clone_external_item_impl () const override
+  {
+    return new ExternalTypeItem (*this);
+  }
+};
+
 // A static item used in an extern block
 class ExternalStaticItem : public ExternalItem
 {

diff --git a/gcc/rust/checks/errors/rust-feature-gate.h b/gcc/rust/checks/errors/rust-feature-gate.h
index 520015543fde59ebb1bd2eaaea49a3fa8af16915..0adc4c07d126e8435934c6414111fc39c5e3774f 100644 (file)
--- a/gcc/rust/checks/errors/rust-feature-gate.h
+++ b/gcc/rust/checks/errors/rust-feature-gate.h
@@ -133,6 +133,7 @@ public:
   void visit (AST::Trait &trait) override {}
   void visit (AST::InherentImpl &impl) override;
   void visit (AST::TraitImpl &impl) override;
+  void visit (AST::ExternalTypeItem &item) override {}
   void visit (AST::ExternalStaticItem &item) override {}
   void visit (AST::ExternalFunctionItem &item) override {}
   void visit (AST::ExternBlock &block) override;

diff --git a/gcc/rust/expand/rust-attribute-visitor.cc b/gcc/rust/expand/rust-attribute-visitor.cc
index cbcfe30325a9b432327b99417adce588125ac873..e6289270e082a9f228608c5b539ab81320bc2e8f 100644 (file)
--- a/gcc/rust/expand/rust-attribute-visitor.cc
+++ b/gcc/rust/expand/rust-attribute-visitor.cc
@@ -2734,6 +2734,13 @@ AttrVisitor::visit (AST::TraitImpl &impl)
   expand_macro_children (MacroExpander::TRAIT_IMPL, impl.get_impl_items (),
                         extractor);
 }
+
+void
+AttrVisitor::visit (AST::ExternalTypeItem &item)
+{
+  // TODO: ARTHUR
+}
+
 void
 AttrVisitor::visit (AST::ExternalStaticItem &item)
 {
@@ -2757,6 +2764,7 @@ AttrVisitor::visit (AST::ExternalStaticItem &item)
 
   expander.pop_context ();
 }
+
 void
 AttrVisitor::visit (AST::ExternalFunctionItem &item)
 {

diff --git a/gcc/rust/expand/rust-attribute-visitor.h b/gcc/rust/expand/rust-attribute-visitor.h
index 1d36d5fab96f06fa9768144ee3244ddf2b161ffd..1b8546e746aa836b013adee4eabd0e8750f24918 100644 (file)
--- a/gcc/rust/expand/rust-attribute-visitor.h
+++ b/gcc/rust/expand/rust-attribute-visitor.h
@@ -223,6 +223,7 @@ public:
   void visit (AST::Trait &trait) override;
   void visit (AST::InherentImpl &impl) override;
   void visit (AST::TraitImpl &impl) override;
+  void visit (AST::ExternalTypeItem &item) override;
   void visit (AST::ExternalStaticItem &item) override;
   void visit (AST::ExternalFunctionItem &item) override;
   void visit (AST::ExternBlock &block) override;

diff --git a/gcc/rust/hir/rust-ast-lower-base.cc b/gcc/rust/hir/rust-ast-lower-base.cc
index a6012f9b8db79387e8403748996cc87665217810..7b0c48f84c2cc7204a7666a3821b33e0f1a9d3c6 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-base.cc
+++ b/gcc/rust/hir/rust-ast-lower-base.cc
@@ -352,6 +352,9 @@ ASTLoweringBase::visit (AST::TraitImpl &)
 {}
 //  void ASTLoweringBase::visit(ExternalItemitem) {}
 void
+ASTLoweringBase::visit (AST::ExternalTypeItem &)
+{}
+void
 ASTLoweringBase::visit (AST::ExternalStaticItem &)
 {}
 void

diff --git a/gcc/rust/hir/rust-ast-lower-base.h b/gcc/rust/hir/rust-ast-lower-base.h
index 79985d9ecddaeb0f27cabb8abce23c755fdf84fc..95d75d1acb53bbe30a55cd22aa7fac6daa9e0556 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-base.h
+++ b/gcc/rust/hir/rust-ast-lower-base.h
@@ -189,6 +189,7 @@ public:
   virtual void visit (AST::InherentImpl &impl);
   virtual void visit (AST::TraitImpl &impl);
   //  virtual void visit(ExternalItem& item);
+  virtual void visit (AST::ExternalTypeItem &item);
   virtual void visit (AST::ExternalStaticItem &item);
   virtual void visit (AST::ExternalFunctionItem &item);
   virtual void visit (AST::ExternBlock &block);

diff --git a/gcc/rust/resolve/rust-ast-resolve-base.cc b/gcc/rust/resolve/rust-ast-resolve-base.cc
index 1eb6644a7b2fe2dc7c02934a5d4e1d0425616645..7bc98027cbf9175c207e546ffba2061b4ec6d1f0 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-base.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-base.cc
@@ -446,6 +446,10 @@ void
 ResolverBase::visit (AST::TraitImpl &)
 {}
 
+void
+ResolverBase::visit (AST::ExternalTypeItem &)
+{}
+
 void
 ResolverBase::visit (AST::ExternalStaticItem &)
 {}

diff --git a/gcc/rust/resolve/rust-ast-resolve-base.h b/gcc/rust/resolve/rust-ast-resolve-base.h
index 9132f43b1334fa3f88b1a6f5e8318cf022873bd0..f4de7c628ae6baef8729e1485d181233d421ebe8 100644 (file)
--- a/gcc/rust/resolve/rust-ast-resolve-base.h
+++ b/gcc/rust/resolve/rust-ast-resolve-base.h
@@ -138,6 +138,7 @@ public:
   void visit (AST::InherentImpl &);
   void visit (AST::TraitImpl &);
 
+  void visit (AST::ExternalTypeItem &);
   void visit (AST::ExternalStaticItem &);
   void visit (AST::ExternalFunctionItem &);
   void visit (AST::ExternBlock &);

diff --git a/gcc/rust/resolve/rust-early-name-resolver.cc b/gcc/rust/resolve/rust-early-name-resolver.cc
index fd3e81ad6e53279b0cdacc9cb0b93f1f1d7c10a2..4078586781c99ae29e612e710232af6fab5b90a1 100644 (file)
--- a/gcc/rust/resolve/rust-early-name-resolver.cc
+++ b/gcc/rust/resolve/rust-early-name-resolver.cc
@@ -770,6 +770,12 @@ EarlyNameResolver::visit (AST::TraitImpl &impl)
   });
 }
 
+void
+EarlyNameResolver::visit (AST::ExternalTypeItem &item)
+{
+  // nothing to do?
+}
+
 void
 EarlyNameResolver::visit (AST::ExternalStaticItem &item)
 {

diff --git a/gcc/rust/resolve/rust-early-name-resolver.h b/gcc/rust/resolve/rust-early-name-resolver.h
index 6d973092101ce8c07633c635a6d4600aea2876d9..7390cb17f65f5e0926a1d6cdc15cdebca8b9f17b 100644 (file)
--- a/gcc/rust/resolve/rust-early-name-resolver.h
+++ b/gcc/rust/resolve/rust-early-name-resolver.h
@@ -215,6 +215,7 @@ private:
   virtual void visit (AST::Trait &trait);
   virtual void visit (AST::InherentImpl &impl);
   virtual void visit (AST::TraitImpl &impl);
+  virtual void visit (AST::ExternalTypeItem &item);
   virtual void visit (AST::ExternalStaticItem &item);
   virtual void visit (AST::ExternalFunctionItem &item);
   virtual void visit (AST::ExternBlock &block);

diff --git a/gcc/rust/util/rust-attributes.cc b/gcc/rust/util/rust-attributes.cc
index d1c86dd2293f695757a03c968a620e26dc4588fe..4ef1ea05afc15741e4c3e4d37a634d6f731b1e20 100644 (file)
--- a/gcc/rust/util/rust-attributes.cc
+++ b/gcc/rust/util/rust-attributes.cc
@@ -621,6 +621,10 @@ void
 AttributeChecker::visit (AST::TraitImpl &)
 {}
 
+void
+AttributeChecker::visit (AST::ExternalTypeItem &)
+{}
+
 void
 AttributeChecker::visit (AST::ExternalStaticItem &)
 {}

diff --git a/gcc/rust/util/rust-attributes.h b/gcc/rust/util/rust-attributes.h
index a33b6770370ce9e3c86b547b9df1904b66a78648..cc01afcbb7f7688f26dc53f54a2c10e80209bf22 100644 (file)
--- a/gcc/rust/util/rust-attributes.h
+++ b/gcc/rust/util/rust-attributes.h
@@ -200,6 +200,7 @@ private:
   void visit (AST::Trait &trait);
   void visit (AST::InherentImpl &impl);
   void visit (AST::TraitImpl &impl);
+  void visit (AST::ExternalTypeItem &item);
   void visit (AST::ExternalStaticItem &item);
   void visit (AST::ExternalFunctionItem &item);
   void visit (AST::ExternBlock &block);