From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tschwinge@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1643)
 id D721A3852744; Wed,  8 Jun 2022 12:21:42 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D721A3852744
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Thomas Schwinge <tschwinge@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/rust/master] macros: Add helper debugging function for
 substituted tokens
X-Act-Checkin: gcc
X-Git-Author: Arthur Cohen <arthur.cohen@embecosm.com>
X-Git-Refname: refs/heads/devel/rust/master
X-Git-Oldrev: 1bb9a29688ab4ddfec7f8d36ca2cee63c5f258d2
X-Git-Newrev: 651d9a77cec0e9db1fbaf3f8a501cfbfc338cea3
Message-Id: <20220608122142.D721A3852744@sourceware.org>
Date: Wed,  8 Jun 2022 12:21:42 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2022 12:21:42 -0000

https://gcc.gnu.org/g:651d9a77cec0e9db1fbaf3f8a501cfbfc338cea3

commit 651d9a77cec0e9db1fbaf3f8a501cfbfc338cea3
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date:   Mon Mar 21 16:52:31 2022 +0100

    macros: Add helper debugging function for substituted tokens
    
    Since this is less noisy, I guess we can keep it in at all times instead
    of commenting it. Doing it like so - through a single function call -
    means that we avoid creating the string entirely in release builds
    
    Co-authored-by: philberty <philip.herron@embecosm.com>

Diff:
---
 gcc/rust/expand/rust-macro-expand.cc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc
index 3bdb8c685e6..f6d63d27d0b 100644
--- a/gcc/rust/expand/rust-macro-expand.cc
+++ b/gcc/rust/expand/rust-macro-expand.cc
@@ -960,6 +960,20 @@ transcribe_context (MacroExpander::ContextType ctx,
     }
 }
 
+static std::string
+tokens_to_str (std::vector<std::unique_ptr<AST::Token>> &tokens)
+{
+  std::string str;
+  if (!tokens.empty ())
+    {
+      str += tokens[0]->as_string ();
+      for (size_t i = 1; i < tokens.size (); i++)
+	str += " " + tokens[i]->as_string ();
+    }
+
+  return str;
+}
+
 AST::ASTFragment
 MacroExpander::transcribe_rule (
   AST::MacroRule &match_rule, AST::DelimTokenTree &invoc_token_tree,
@@ -979,9 +993,8 @@ MacroExpander::transcribe_rule (
   std::vector<std::unique_ptr<AST::Token>> substituted_tokens
     = substitute_context.substitute_tokens ();
 
-  // handy for debugging
-  // for (auto &tok : substituted_tokens)
-  //   rust_debug ("[tok] %s", tok->as_string ().c_str ());
+  rust_debug ("substituted tokens: %s",
+	      tokens_to_str (substituted_tokens).c_str ());
 
   // parse it to an ASTFragment
   MacroInvocLexer lex (std::move (substituted_tokens));