Add ast_printer.cc to the cxx-parser library

Author: robertoraggi

packages/cxx-gen-ast/src/gen.ts

@@ -67,11 +67,11 @@ gen_ast_visitor_h({
 });
 gen_ast_dump_h({
   ast,
-  output: path.join(outdir, "src/frontend/cxx/ast_printer.h"),
+  output: path.join(outdir, "src/parser/cxx/ast_printer.h"),
 });
 gen_ast_dump_cc({
   ast,
-  output: path.join(outdir, "src/frontend/cxx/ast_printer.cc"),
+  output: path.join(outdir, "src/parser/cxx/ast_printer.cc"),
 });
 gen_ast_kind_h({ ast, output: path.join(outdir, "src/parser/cxx/ast_kind.h") });
 gen_ast_slot_h({ ast, output: path.join(outdir, "src/parser/cxx/ast_slot.h") });

packages/cxx-gen-ast/src/gen_ast_dump_cc.ts

@@ -108,7 +108,9 @@ export function gen_ast_dump_cc({ ast, output }: { ast: AST; output: string }) {
       if (base == "ExpressionAST") {
         emit(`  out_ << "${astName(name)}";`);
         emit(`  if (ast->type) {`);
-        emit(`    out_ << std::format(" [{} {}]", to_string(ast->valueCategory), to_string(ast->type));`);
+        emit(
+          `    out_ << std::format(" [{} {}]", to_string(ast->valueCategory), to_string(ast->type));`
+        );
         emit(`  }`);
         emit(`  out_ << "\\n";`);
       } else {
@@ -137,8 +139,9 @@ export function gen_ast_dump_cc({ ast, output }: { ast: AST; output: string }) {
   });
 
   const out = `${cpy_header}
-#include "ast_printer.h"
+#include <cxx/ast_printer.h>
 
+// cxx
 #include <cxx/ast.h>
 #include <cxx/translation_unit.h>
 #include <cxx/names.h>

src/frontend/CMakeLists.txt

@@ -19,7 +19,6 @@
 
 
 add_executable(cxx
-    cxx/ast_printer.cc
     cxx/frontend.cc
     cxx/verify_diagnostics_client.cc
 )

src/frontend/cxx/frontend.cc

@@ -41,14 +41,15 @@
 #include <cxx/mlir/cxx_dialect.h>
 #endif
 
+#include <cxx/ast_printer.h>
+
 #include <format>
 #include <fstream>
 #include <iostream>
 #include <list>
 #include <regex>
 #include <string>
 
-#include "ast_printer.h"
 #include "verify_diagnostics_client.h"
 
 namespace {

src/parser/CMakeLists.txt

@@ -23,6 +23,7 @@ file(GLOB CXX_VIEWS_INCLUDE_HEADER_FILES cxx/views/*.h)
 add_library(cxx-parser
     cxx/ast_cursor.cc
     cxx/ast_interpreter.cc
+    cxx/ast_printer.cc
     cxx/ast_rewriter.cc
     cxx/ast_slot.cc
     cxx/ast.cc

src/frontend/cxx/ast_printer.cc renamed to src/parser/cxx/ast_printer.cc

@@ -18,8 +18,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "ast_printer.h"
+#include <cxx/ast_printer.h>
 
+// cxx
 #include <cxx/ast.h>
 #include <cxx/literals.h>
 #include <cxx/names.h>