Add keepSpace to improve formatting of the AST printer

Signed-off-by: Roberto Raggi <[email protected]>

Author: robertoraggi

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

@@ -78,6 +78,7 @@ export function gen_ast_pretty_printer_cc({
     emit(`}`);
     emit(`void space() { accept.space(); }`);
     emit(`void nospace() { accept.nospace(); }`);
+    emit(`void keepSpace() { accept.keepSpace(); }`);
     emit(`void newline() { accept.newline(); }`);
     emit(`void nonewline() { accept.nonewline(); }`);
     emit(`void indent() { accept.indent(); }`);
@@ -99,6 +100,11 @@ export function gen_ast_pretty_printer_cc({
         }
         break;
 
+      case "opLoc":
+        emit(`space();`);
+        emit(`keepSpace();`);
+        break;
+
       case "closeLoc":
       case "colonLoc":
       case "dotLoc":
@@ -149,6 +155,15 @@ export function gen_ast_pretty_printer_cc({
         }
         break;
 
+      case "equalLoc":
+        emit(`keepSpace();`);
+        break;
+
+      case "opLoc":
+        emit(`space();`);
+        emit(`keepSpace();`);
+        break;
+
       case "closeLoc":
       case "lbracketLoc":
       case "lbracket2Loc":
@@ -379,11 +394,17 @@ void ASTPrettyPrinter::space() {
 }
 
 void ASTPrettyPrinter::nospace() {
+  if (keepSpace_) return;
   space_ = false;
 }
 
+void ASTPrettyPrinter::keepSpace() {
+  keepSpace_ = true;
+}
+
 void ASTPrettyPrinter::newline() {
   space_ = false;
+  keepSpace_ = false;
   newline_ = true;
 }
 

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

@@ -99,6 +99,7 @@ ${code.join("\n")}
     }
     newline_ = false;
     space_ = false;
+    keepSpace_ = false;
     std::format_to(output_, fmt, std::forward<Args>(args)...);
     space();
   }
@@ -107,6 +108,7 @@ ${code.join("\n")}
 
   void space();
   void nospace();
+  void keepSpace();
   void newline();
   void nonewline();
   void indent();
@@ -117,6 +119,7 @@ private:
   std::ostream_iterator<char> output_;
   int depth_ = 0;
   bool space_ = false;
+  bool keepSpace_ = false;
   bool newline_ = false;
 };