Improvements and fixes

Author: jeremy-rifkin

clang-tools-extra/pseudo/fuzzer/Fuzzer.cpp

@@ -46,7 +46,7 @@ class Fuzzer {
         glrParse(clang::pseudo::ParseParams{ParseableStream, Arena, GSS},
                  *Lang.G.findNonterminal("translation-unit"), Lang);
     if (Print)
-      llvm::outs() << Root.dumpRecursive(Lang.G, std::nullopt);
+      llvm::outs() << Root.dumpRecursive(Lang.G);
   }
 };
 

clang-tools-extra/pseudo/include/clang-pseudo/Forest.h

@@ -114,12 +114,17 @@ class alignas(class ForestNode *) ForestNode {
   // Iteration over all nodes in the forest, including this.
   llvm::iterator_range<RecursiveIterator> descendants() const;
 
-  std::string
-  dump(const Grammar &,
-       std::optional<std::reference_wrapper<const TokenStream>>) const;
+  // Dump forest node to text. If Code is std::nullopt, terminals will be
+  // displayed as token indexes.
+  std::string dump(const Grammar &,
+                   std::optional<std::reference_wrapper<const TokenStream>>
+                       Code = std::nullopt) const;
+  // Dump forest node recursively to text. If Code is std::nullopt, terminals
+  // will be displayed as token indexes.
   std::string
   dumpRecursive(const Grammar &,
-                std::optional<std::reference_wrapper<const TokenStream>>,
+                std::optional<std::reference_wrapper<const TokenStream>> Code =
+                    std::nullopt,
                 bool Abbreviated = false) const;
 
 private:

clang-tools-extra/pseudo/lib/GLR.cpp

@@ -527,8 +527,7 @@ class GLRReduce {
         SequenceNodes.size() == 1
             ? SequenceNodes.front()
             : &Params.Forest.createAmbiguous(F.Symbol, SequenceNodes);
-    LLVM_DEBUG(llvm::dbgs()
-               << "    --> " << Parsed->dump(Lang.G, std::nullopt) << "\n");
+    LLVM_DEBUG(llvm::dbgs() << "    --> " << Parsed->dump(Lang.G) << "\n");
 
     // Bases for this family, deduplicate them, and group by the goTo State.
     sortAndUnique(FamilyBases);

clang-tools-extra/pseudo/tool/ClangPseudo.cpp

@@ -53,7 +53,7 @@ static opt<bool> PrintStatistics("print-statistics", desc("Print GLR parser stat
 static opt<bool> PrintForest("print-forest", desc("Print parse forest"));
 static opt<bool>
     PrintTerminalTokens("print-terminal-tokens",
-                           desc("Print terminal tokens in parse forest"));
+                        desc("Print terminal tokens in parse forest"));
 static opt<bool> ForestAbbrev("forest-abbrev", desc("Abbreviate parse forest"),
                               init(true));
 static opt<std::string> HTMLForest("html-forest",

clang-tools-extra/pseudo/unittests/ForestTest.cpp

@@ -73,12 +73,12 @@ TEST_F(ForestTest, DumpBasic) {
   const auto *Add =
       &Arena.createSequence(symbol("add-expression"), ruleFor("add-expression"),
                             {Left, &T[1], Right});
-  EXPECT_EQ(Add->dumpRecursive(G, true),
+  EXPECT_EQ(Add->dumpRecursive(G, std::nullopt, true),
             "[  0, end) add-expression := id-expression + id-expression\n"
             "[  0,   1) ├─id-expression~IDENTIFIER := tok[0]\n"
             "[  1,   2) ├─+ := tok[1]\n"
             "[  2, end) └─id-expression~IDENTIFIER := tok[2]\n");
-  EXPECT_EQ(Add->dumpRecursive(G, false),
+  EXPECT_EQ(Add->dumpRecursive(G, std::nullopt, false),
             "[  0, end) add-expression := id-expression + id-expression\n"
             "[  0,   1) ├─id-expression := IDENTIFIER\n"
             "[  0,   1) │ └─IDENTIFIER := tok[0]\n"
@@ -144,7 +144,7 @@ TEST_F(ForestTest, DumpAbbreviatedShared) {
 
   // We must not abbreviate away shared nodes: if we show A~* there's no way to
   // show that the intermediate B node is shared between A1 and A2.
-  EXPECT_EQ(A->dumpRecursive(G, /*Abbreviate=*/true),
+  EXPECT_EQ(A->dumpRecursive(G, std::nullopt, /*Abbreviate=*/true),
             "[  0, end) A := <ambiguous>\n"
             "[  0, end) ├─A~B := * #1\n"
             "[  0, end) │ └─* := tok[0]\n"