Merge pull request #26943 from rintaro/syntaxparse-parsedrawnode-dump

[SyntaxParse] Improve ParsedRawSyntaxNode::dump()

Author: rintaro

lib/Parse/ParsedRawSyntaxNode.cpp

@@ -56,37 +56,34 @@ void ParsedRawSyntaxNode::dump() const {
 }
 
 void ParsedRawSyntaxNode::dump(llvm::raw_ostream &OS, unsigned Indent) const {
-  auto indent = [&](unsigned Amount) {
-    for (decltype(Amount) i = 0; i < Amount; ++i) {
-      OS << ' ';
-    }
-  };
-
-  indent(Indent);
-
-  if (isNull()) {
-    OS << "(<NULL>)";
-    return;
-  }
-
+  for (decltype(Indent) i = 0; i < Indent; ++i)
+    OS << ' ';
   OS << '(';
   dumpSyntaxKind(OS, getKind());
 
-  if (isToken()) {
-    dumpTokenKind(OS, getTokenKind());
-
-  } else {
-    if (isRecorded()) {
-      OS << " [recorded]";
-    } else if (isDeferredLayout()) {
+  switch (DK) {
+    case DataKind::Null:
+      OS << "<NULL>";
+      break;
+    case DataKind::Recorded:
+      OS << " [recorded] ";
+      if (isToken()) {
+        dumpTokenKind(OS, getTokenKind());
+      } else {
+        OS << "<layout>";
+      }
+      break;
+    case DataKind::DeferredLayout:
+      OS << " [deferred]";
       for (const auto &child : getDeferredChildren()) {
         OS << "\n";
-        child.dump(OS, Indent + 1);
+        child.dump(OS, Indent + 2);
       }
-    } else {
-      assert(isDeferredToken());
-      OS << " [deferred token]";
-    }
+      break;
+    case DataKind::DeferredToken:
+      OS << " [deferred] ";
+      dumpTokenKind(OS, getTokenKind());
+      break;
   }
   OS << ')';
 }

lib/Parse/SyntaxParsingContext.cpp

@@ -296,7 +296,7 @@ void SyntaxParsingContext::synthesize(tok Kind, SourceLoc Loc) {
 void SyntaxParsingContext::dumpStorage() const  {
   llvm::errs() << "======================\n";
   for (auto Node : getStorage()) {
-    Node.dump();
+    Node.dump(llvm::errs());
     llvm::errs() << "\n--------------\n";
   }
 }