[committed 037/103] gccrs: ast: Module: unloaded module and inner attributes

[arthur . cohen]

From: Jakub Dupak <d...@jakubdupak.com>

gcc/rust/ChangeLog:

        * ast/rust-ast-dump.cc (Dump::visit): Properly handle unloaded modules.

Signed-off-by: Jakub Dupak <d...@jakubdupak.com>
---
 gcc/rust/ast/rust-ast-dump.cc | 41 +++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/gcc/rust/ast/rust-ast-dump.cc b/gcc/rust/ast/rust-ast-dump.cc
index 1e7a235932d..a12c3922c47 100644
--- a/gcc/rust/ast/rust-ast-dump.cc
+++ b/gcc/rust/ast/rust-ast-dump.cc
@@ -810,21 +810,44 @@ Dump::visit (Method &method)
 void
 Dump::visit (Module &module)
 {
-  emit_visibility (module.get_visibility ());
-  stream << "mod " << module.get_name () << " {\n";
+  //  Syntax:
+  //   mod IDENTIFIER ;
+  //     | mod IDENTIFIER {
+  //     InnerAttribute*
+  //     Item*
+  //   }
 
-  indentation.increment ();
+  emit_visibility (module.get_visibility ());
+  stream << "mod " << module.get_name ();
 
-  for (auto &item : module.get_items ())
+  if (module.get_kind () == Module::UNLOADED)
     {
-      stream << indentation;
-      item->accept_vis (*this);
-      stream << '\n';
+      stream << ";\n";
     }
+  else /* Module::LOADED */
+    {
+      stream << " {\n";
 
-  indentation.decrement ();
+      indentation.increment ();
 
-  stream << indentation << "}\n";
+      for (auto &item : module.get_inner_attrs ())
+       {
+         stream << indentation;
+         emit_attrib (item);
+         stream << '\n';
+       }
+
+      for (auto &item : module.get_items ())
+       {
+         stream << indentation;
+         item->accept_vis (*this);
+         stream << '\n';
+       }
+
+      indentation.decrement ();
+
+      stream << indentation << "}\n";
+    }
 }
 
 void
-- 
2.39.1

-- 
Gcc-rust mailing list
Gcc-rust@gcc.gnu.org
https://gcc.gnu.org/mailman/listinfo/gcc-rust