From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 864F03856DC7; Mon, 29 Aug 2022 15:32:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 864F03856DC7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661787138; bh=yz4sBd8qJzj6W1eYaQkcV589F3V/Ze4a4AZLx4A2Tgc=; h=From:To:Subject:Date:From; b=PTZDxJrq3trq9rZYiUNlUgtzH8DNjyDgPq8weDWxtMSq8KHdvsiEFYhL80KwyxyZK mMKHK5Ep+HR5tKHxBRXkfj/v6FRfgZV8w2eLX16sS8LWbSU1ZHBQsto0AOPHmeo8ms qO08Yr5hU8n6X28FoTQuWFF2/+R1ZfLkZzANkgzU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] session-manager: Add ast-pretty-expanded dump X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: b1ddbf1851aab77fd945046c73359b58e9c8383b X-Git-Newrev: a9055d8294f28ae84023cc93ae8d8b14747a2d0c Message-Id: <20220829153218.864F03856DC7@sourceware.org> Date: Mon, 29 Aug 2022 15:32:18 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a9055d8294f28ae84023cc93ae8d8b14747a2d0c commit a9055d8294f28ae84023cc93ae8d8b14747a2d0c Author: Arthur Cohen Date: Thu Aug 11 17:16:24 2022 +0200 session-manager: Add ast-pretty-expanded dump Diff: --- gcc/rust/rust-session-manager.cc | 10 ++++++++-- gcc/rust/rust-session-manager.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc index 6d7f1a85f19..fc66b692c95 100644 --- a/gcc/rust/rust-session-manager.cc +++ b/gcc/rust/rust-session-manager.cc @@ -58,6 +58,7 @@ namespace Rust { 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 *kASTExpandedDumpFile = "gccrs.ast-expanded.dump"; const char *kHIRDumpFile = "gccrs.hir.dump"; const char *kHIRPrettyDumpFile = "gccrs.hir-pretty.dump"; @@ -509,6 +510,7 @@ Session::compile_crate (const char *filename) // dump AST with expanded stuff rust_debug ("BEGIN POST-EXPANSION AST DUMP"); dump_ast_expanded (parser, parsed_crate); + dump_ast_pretty (parsed_crate, true); rust_debug ("END POST-EXPANSION AST DUMP"); } @@ -810,10 +812,14 @@ Session::dump_ast (Parser &parser, AST::Crate &crate) const } void -Session::dump_ast_pretty (AST::Crate &crate) const +Session::dump_ast_pretty (AST::Crate &crate, bool expanded) const { std::ofstream out; - out.open (kASTPrettyDumpFile); + if (expanded) + out.open (kASTPrettyDumpFileExpanded); + else + out.open (kASTPrettyDumpFile); + if (out.fail ()) { rust_error_at (Linemap::unknown_location (), "cannot open %s:%m; ignored", diff --git a/gcc/rust/rust-session-manager.h b/gcc/rust/rust-session-manager.h index 99dd107239b..b3724c540c3 100644 --- a/gcc/rust/rust-session-manager.h +++ b/gcc/rust/rust-session-manager.h @@ -319,7 +319,7 @@ private: void dump_lex (Parser &parser) const; void dump_ast (Parser &parser, AST::Crate &crate) const; - void dump_ast_pretty (AST::Crate &crate) const; + void dump_ast_pretty (AST::Crate &crate, bool expanded = false) const; void dump_ast_expanded (Parser &parser, AST::Crate &crate) const; void dump_hir (HIR::Crate &crate) const; void dump_hir_pretty (HIR::Crate &crate) const;