add-dump-content

Author: danakj

toolchain/check/dump_id.cpp

@@ -4,6 +4,7 @@
 
 #include "toolchain/check/dump_id.h"
 
+#include "common/check.h"
 #include "llvm/Support/raw_ostream.h"
 #include "toolchain/check/context.h"
 #include "toolchain/lex/tokenized_buffer.h"
@@ -13,14 +14,21 @@
 namespace Carbon::Check::DumpIdOverloads {
 
 auto DumpId(SemIR::LocId loc_id, const Context& context) -> void {
+  if (!loc_id.is_valid()) {
+    llvm::errs() << "LocId(invalid)";
+    return;
+  }
+
   if (loc_id.is_node_id()) {
     auto token = context.parse_tree().node_token(loc_id.node_id());
     auto line = context.tokens().GetLineNumber(token);
     auto col = context.tokens().GetColumnNumber(token);
     const char* implicit = loc_id.is_implicit() ? " implicit" : "";
     llvm::errs() << "LocId(line: " << line << ", col: " << col << implicit
                  << ")";
-  } else if (loc_id.is_import_ir_inst_id()) {
+  } else {
+    CARBON_CHECK(loc_id.is_import_ir_inst_id());
+
     auto import_ir_id = context.sem_ir()
                             .import_ir_insts()
                             .Get(loc_id.import_ir_inst_id())
@@ -30,8 +38,6 @@ auto DumpId(SemIR::LocId loc_id, const Context& context) -> void {
     llvm::errs() << "LocId(import from \"";
     llvm::errs().write_escaped(import_file->filename());
     llvm::errs() << "\")";
-  } else {
-    llvm::errs() << "LocId(invalid)";
   }
 }
 

toolchain/lex/dump_id.cpp

@@ -9,8 +9,19 @@
 
 namespace Carbon::Lex::DumpIdOverloads {
 
-auto DumpId(TokenIndex /*token*/, const TokenizedBuffer& /*buffer*/) -> void {
-  llvm::errs() << "TokenIndex(?)";
+auto DumpId(TokenIndex token, const TokenizedBuffer& buffer) -> void {
+  if (!token.is_valid()) {
+    llvm::errs() << "TokenIndex(invalid)";
+    return;
+  }
+
+  auto kind = buffer.GetKind(token);
+  auto line = buffer.GetLineNumber(token);
+  auto col = buffer.GetColumnNumber(token);
+
+  llvm::errs() << "TokenIndex(kind: ";
+  kind.Print(llvm::errs());
+  llvm::errs() << ", line: " << line << ", col: " << col << ")";
 }
 
 }  // namespace Carbon::Lex::DumpIdOverloads

toolchain/parse/dump_id.cpp

@@ -5,22 +5,25 @@
 #include "toolchain/parse/dump_id.h"
 
 #include "llvm/Support/raw_ostream.h"
+#include "toolchain/lex/dump_id.h"
 #include "toolchain/parse/tree.h"
 
 namespace Carbon::Parse::DumpIdOverloads {
 
 auto DumpId(NodeId node_id, const Tree& tree) -> void {
   if (!node_id.is_valid()) {
     llvm::errs() << "NodeId(invalid)";
+    return;
   }
 
-  llvm::errs() << "NodeId(";
+  auto kind = tree.node_kind(node_id);
   auto token = tree.node_token(node_id);
-  llvm::errs() << "token = ";
-  tree.DumpId(token);
-  llvm::errs() << ")";
 
-  llvm::errs() << "A node id";
+  llvm::errs() << "NodeId(kind: ";
+  kind.Print(llvm::errs());
+  llvm::errs() << ", token: ";
+  Lex::DumpIdOverloads::DumpId(token, tree.tokens());
+  llvm::errs() << ")";
 }
 
 }  // namespace Carbon::Parse::DumpIdOverloads

toolchain/parse/dump_id.h

@@ -29,7 +29,7 @@ class DumpIdMethods {
 
  public:
   LLVM_DUMP_METHOD auto DumpId(Lex::TokenIndex token) const -> void {
-    static_cast<const Tree&>(*this).tokens_->DumpId(token);
+    static_cast<const Tree&>(*this).tokens().DumpId(token);
   }
   LLVM_DUMP_METHOD auto DumpId(NodeId node_id) const -> void {
     DumpIdOverloads::DumpId(node_id, static_cast<const Tree&>(*this));

toolchain/parse/tree.h

@@ -81,8 +81,6 @@ struct File;
 // The DumpIdMethods parent class provides a `DumpId(x)` method for many types
 // across the toolchain.
 class Tree : public Printable<Tree>, public DumpIdMethods<Tree> {
-  friend class DumpIdMethods<Tree>;  // Access to `tokens_`.
-
  public:
   class PostorderIterator;
 
@@ -137,6 +135,8 @@ class Tree : public Printable<Tree>, public DumpIdMethods<Tree> {
   // Returns the token the given parse tree node models.
   auto node_token(NodeId n) const -> Lex::TokenIndex;
 
+  auto tokens() const -> const Lex::TokenizedBuffer& { return *tokens_; }
+
   // Returns whether this node is a valid node of the specified type.
   template <typename T>
   auto IsValid(NodeId node_id) const -> bool {