From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Wed, 21 Jun 2023 21:11:19 +0000 (+0200)
Subject: gccrs: dump: Remove tokenstream dump
X-Git-Tag: basepoints/gcc-15~2434
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2bb344624612c64bcca4683a760da81911030f9;p=thirdparty%2Fgcc.git

gccrs: dump: Remove tokenstream dump

This dump will soon replace ast-pretty print and is hence no longer
required.

gcc/rust/ChangeLog:

	* rust-session-manager.cc (Session::enable_dump): Remove
	tokenstream dump.
	(Session::compile_crate): Likewise.
	(Session::dump_tokenstream): Likewise.
	* rust-session-manager.h (struct CompileOptions): Likewise.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
---

diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc
index 2c847834eb3e..8613c1c9cc8e 100644
--- a/gcc/rust/rust-session-manager.cc
+++ b/gcc/rust/rust-session-manager.cc
@@ -64,7 +64,6 @@ const char *kLexDumpFile = "gccrs.lex.dump";
 const char *kASTDumpFile = "gccrs.ast.dump";
 const char *kASTPrettyDumpFile = "gccrs.ast-pretty.dump";
 const char *kASTPrettyDumpFileExpanded = "gccrs.ast-pretty-expanded.dump";
-const char *kASTDumpTokenStream = "gccrs.ast-tokenstream.dump";
 const char *kASTExpandedDumpFile = "gccrs.ast-expanded.dump";
 const char *kHIRDumpFile = "gccrs.hir.dump";
 const char *kHIRPrettyDumpFile = "gccrs.hir-pretty.dump";
@@ -302,7 +301,7 @@ Session::enable_dump (std::string arg)
       rust_error_at (
 	Location (),
 	"dump option was not given a name. choose %<lex%>, %<ast-pretty%>, "
-	"%<ast-tokenstream%>, %<register_plugins%>, %<injection%>, "
+	"%<register_plugins%>, %<injection%>, "
 	"%<expansion%>, %<resolution%>, %<target_options%>, %<hir%>, "
 	"%<hir-pretty%>, or %<all%>");
       return false;
@@ -320,10 +319,6 @@ Session::enable_dump (std::string arg)
     {
       options.enable_dump_option (CompileOptions::AST_DUMP_PRETTY);
     }
-  else if (arg == "ast-tokenstream")
-    {
-      options.enable_dump_option (CompileOptions::AST_DUMP_TOKENSTREAM);
-    }
   else if (arg == "register_plugins")
     {
       options.enable_dump_option (CompileOptions::REGISTER_PLUGINS_DUMP);
@@ -357,7 +352,7 @@ Session::enable_dump (std::string arg)
       rust_error_at (
 	Location (),
 	"dump option %qs was unrecognised. choose %<lex%>, %<ast-pretty%>, "
-	"%<ast-tokenstream%>, %<register_plugins%>, %<injection%>, "
+	"%<register_plugins%>, %<injection%>, "
 	"%<expansion%>, %<resolution%>, %<target_options%>, %<hir%>, "
 	"%<hir-pretty%>, or %<all%>",
 	arg.c_str ());
@@ -511,10 +506,6 @@ Session::compile_crate (const char *filename)
   handle_crate_name (*ast_crate.get ());
 
   // dump options except lexer dump
-  if (options.dump_option_enabled (CompileOptions::AST_DUMP_TOKENSTREAM))
-    {
-      dump_tokenstream (*ast_crate.get ());
-    }
   if (options.dump_option_enabled (CompileOptions::AST_DUMP_PRETTY))
     {
       dump_ast_pretty (*ast_crate.get ());
@@ -922,25 +913,6 @@ Session::dump_ast_pretty (AST::Crate &crate, bool expanded) const
   out.close ();
 }
 
-void
-Session::dump_tokenstream (AST::Crate &crate) const
-{
-  std::ofstream out;
-  out.open (kASTDumpTokenStream);
-  if (out.fail ())
-    {
-      rust_error_at (Linemap::unknown_location (), "cannot open %s:%m; ignored",
-		     kASTDumpTokenStream);
-    }
-  std::vector<TokenPtr> tokens;
-  AST::TokenCollector (tokens).visit (crate);
-  for (auto &token : tokens)
-    {
-      out << token->as_string () << " ";
-    }
-  out.close ();
-}
-
 void
 Session::dump_hir (HIR::Crate &crate) const
 {
diff --git a/gcc/rust/rust-session-manager.h b/gcc/rust/rust-session-manager.h
index 92de61e1537f..882de1a04580 100644
--- a/gcc/rust/rust-session-manager.h
+++ b/gcc/rust/rust-session-manager.h
@@ -194,7 +194,6 @@ struct CompileOptions
   {
     LEXER_DUMP,
     AST_DUMP_PRETTY,
-    AST_DUMP_TOKENSTREAM,
     REGISTER_PLUGINS_DUMP,
     INJECTION_DUMP,
     EXPANSION_DUMP,
@@ -252,7 +251,6 @@ struct CompileOptions
   {
     enable_dump_option (DumpOption::LEXER_DUMP);
     enable_dump_option (DumpOption::AST_DUMP_PRETTY);
-    enable_dump_option (DumpOption::AST_DUMP_TOKENSTREAM);
     enable_dump_option (DumpOption::REGISTER_PLUGINS_DUMP);
     enable_dump_option (DumpOption::INJECTION_DUMP);
     enable_dump_option (DumpOption::EXPANSION_DUMP);
@@ -368,7 +366,6 @@ private:
 
   void dump_lex (Parser<Lexer> &parser) const;
   void dump_ast_pretty (AST::Crate &crate, bool expanded = false) const;
-  void dump_tokenstream (AST::Crate &crate) const;
   void dump_hir (HIR::Crate &crate) const;
   void dump_hir_pretty (HIR::Crate &crate) const;