chore: Simplify TranslationUnit initialization

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

Author: robertoraggi

src/frontend/cxx/cxx_document.cc

@@ -70,9 +70,8 @@ struct Diagnostics final : cxx::DiagnosticsClient {
 struct CxxDocument::Private {
   const CLI& cli;
   long version;
-  Control control;
   Diagnostics diagnosticsClient;
-  TranslationUnit unit{&control, &diagnosticsClient};
+  TranslationUnit unit{&diagnosticsClient};
   std::shared_ptr<Toolchain> toolchain;
 
   Private(const CLI& cli, long version) : cli(cli), version(version) {}
@@ -146,7 +145,7 @@ void CxxDocument::Private::configure() {
   }
 
   if (toolchain) {
-    control.setMemoryLayout(toolchain->memoryLayout());
+    unit.control()->setMemoryLayout(toolchain->memoryLayout());
 
     if (!cli.opt_nostdinc) toolchain->addSystemIncludePaths();
 

src/frontend/cxx/frontend.cc

@@ -98,9 +98,8 @@ void dumpTokens(const CLI& cli, TranslationUnit& unit, std::ostream& output) {
 }
 
 auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
-  Control control;
   VerifyDiagnosticsClient diagnosticsClient;
-  TranslationUnit unit(&control, &diagnosticsClient);
+  TranslationUnit unit(&diagnosticsClient);
 
   auto preprocesor = unit.preprocessor();
 
@@ -174,7 +173,7 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
   }
 
   if (toolchain) {
-    control.setMemoryLayout(toolchain->memoryLayout());
+    unit.control()->setMemoryLayout(toolchain->memoryLayout());
 
     if (!cli.opt_nostdinc) toolchain->addSystemIncludePaths();
 

src/js/cxx/api.cc

@@ -59,14 +59,12 @@ struct DiagnosticsClient final : cxx::DiagnosticsClient {
 };
 
 struct WrappedUnit {
-  cxx::Control control;
   std::unique_ptr<DiagnosticsClient> diagnosticsClient;
   std::unique_ptr<cxx::TranslationUnit> unit;
 
   WrappedUnit(std::string source, std::string filename) {
     diagnosticsClient = std::make_unique<DiagnosticsClient>();
-    unit = std::make_unique<cxx::TranslationUnit>(&control,
-                                                  diagnosticsClient.get());
+    unit = std::make_unique<cxx::TranslationUnit>(diagnosticsClient.get());
     if (auto preprocessor = unit->preprocessor()) {
       preprocessor->setCanResolveFiles(false);
     }
@@ -275,7 +273,7 @@ auto register_lexer(const char* name = "Lexer") -> class_<cxx::Lexer> {
 auto register_translation_unit(const char* name = "TranslationUnit")
     -> class_<cxx::TranslationUnit> {
   return class_<cxx::TranslationUnit>(name)
-      .constructor<cxx::Control*, cxx::DiagnosticsClient*>()
+      .constructor<cxx::DiagnosticsClient*>()
       .function("setSource", &cxx::TranslationUnit::setSource)
       .function("parse", &cxx::TranslationUnit::parse)
       .function("tokenCount", &cxx::TranslationUnit::tokenCount)

src/parser/cxx/parser.cc

@@ -418,7 +418,7 @@ struct Parser::LookaheadParser {
   }
 
   ~LookaheadParser() {
-    p->unit->changeDiagnosticsClient(previousClient);
+    (void)p->unit->changeDiagnosticsClient(previousClient);
 
     if (!committed) {
       p->rewind(loc);

src/parser/cxx/translation_unit.cc

@@ -41,20 +41,21 @@
 
 namespace cxx {
 
-TranslationUnit::TranslationUnit(Control* control,
-                                 DiagnosticsClient* diagnosticsClient)
-    : control_(control), diagnosticsClient_(diagnosticsClient) {
+TranslationUnit::TranslationUnit(DiagnosticsClient* diagnosticsClient)
+    : diagnosticsClient_(diagnosticsClient) {
+  control_ = std::make_unique<Control>();
   arena_ = std::make_unique<Arena>();
   globalNamespace_ = control_->newNamespaceSymbol(nullptr, {});
 
-  preprocessor_ = std::make_unique<Preprocessor>(control_, diagnosticsClient_);
+  preprocessor_ =
+      std::make_unique<Preprocessor>(control_.get(), diagnosticsClient_);
 
   if (diagnosticsClient_) {
     diagnosticsClient_->setPreprocessor(preprocessor_.get());
   }
 }
 
-TranslationUnit::~TranslationUnit() = default;
+TranslationUnit::~TranslationUnit() {}
 
 auto TranslationUnit::diagnosticsClient() const -> DiagnosticsClient* {
   return diagnosticsClient_;
@@ -63,6 +64,11 @@ auto TranslationUnit::diagnosticsClient() const -> DiagnosticsClient* {
 auto TranslationUnit::changeDiagnosticsClient(
     DiagnosticsClient* diagnosticsClient) -> DiagnosticsClient* {
   std::swap(diagnosticsClient_, diagnosticsClient);
+
+  if (diagnosticsClient_) {
+    diagnosticsClient_->setPreprocessor(preprocessor_.get());
+  }
+
   return diagnosticsClient;
 }
 

src/parser/cxx/translation_unit.h

@@ -41,19 +41,17 @@ namespace cxx {
 
 class TranslationUnit {
  public:
-  explicit TranslationUnit(Control* control,
-                           DiagnosticsClient* diagosticsClient);
-
+  explicit TranslationUnit(DiagnosticsClient* diagosticsClient = nullptr);
   ~TranslationUnit();
 
-  [[nodiscard]] auto control() const -> Control* { return control_; }
+  [[nodiscard]] auto control() const -> Control* { return control_.get(); }
 
   [[nodiscard]] auto arena() const -> Arena* { return arena_.get(); }
 
   [[nodiscard]] auto diagnosticsClient() const -> DiagnosticsClient*;
 
-  auto changeDiagnosticsClient(DiagnosticsClient* diagnosticsClient)
-      -> DiagnosticsClient*;
+  [[nodiscard]] auto changeDiagnosticsClient(
+      DiagnosticsClient* diagnosticsClient) -> DiagnosticsClient*;
 
   [[nodiscard]] auto ast() const -> UnitAST* { return ast_; }
 
@@ -64,6 +62,7 @@ class TranslationUnit {
   [[nodiscard]] auto fileName() const -> const std::string& {
     return fileName_;
   }
+
   [[nodiscard]] auto preprocessor() const -> Preprocessor* {
     return preprocessor_.get();
   }
@@ -137,7 +136,7 @@ class TranslationUnit {
       const std::function<void(std::span<const std::uint8_t>)>& onData) -> bool;
 
  private:
-  Control* control_;
+  std::unique_ptr<Control> control_;
   std::unique_ptr<Arena> arena_;
   std::vector<Token> tokens_;
   std::string fileName_;

tests/api_tests/test_substitution.cc

@@ -44,9 +44,8 @@ auto dump_symbol(Symbol* symbol) -> std::string {
 }
 
 struct Source {
-  Control control;
   DiagnosticsClient diagnosticsClient;
-  TranslationUnit unit{&control, &diagnosticsClient};
+  TranslationUnit unit{&diagnosticsClient};
 
   explicit Source(std::string_view source) {
     unit.setSource(std::string(source), "<test>");
@@ -58,12 +57,13 @@ struct Source {
     });
   }
 
+  auto control() -> Control* { return unit.control(); }
   auto ast() -> UnitAST* { return unit.ast(); }
   auto scope() -> Scope* { return unit.globalScope(); }
 
   auto get(std::string_view name) -> Symbol* {
     Symbol* symbol = nullptr;
-    auto id = control.getIdentifier(name);
+    auto id = unit.control()->getIdentifier(name);
     for (auto candidate : scope()->get(id)) {
       if (symbol) return nullptr;
       symbol = candidate;
@@ -74,7 +74,7 @@ struct Source {
   auto instantiate(std::string_view name,
                    const std::vector<TemplateArgument>& arguments) -> Symbol* {
     auto symbol = get(name);
-    return control.instantiate(&unit, symbol, arguments);
+    return control()->instantiate(&unit, symbol, arguments);
   }
 };
 
@@ -86,7 +86,7 @@ struct LookupMember {
   Source& source;
 
   auto operator()(Scope* scope, std::string_view name) -> Symbol* {
-    auto id = source.control.getIdentifier(name);
+    auto id = source.control()->getIdentifier(name);
     for (auto candidate : scope->get(id)) {
       return candidate;
     }
@@ -110,7 +110,7 @@ TEST(Substitution, TypeAlias) {
     using F = T (*)(T const, U*, ...);
   )"_cxx;
 
-  auto control = &source.control;
+  auto control = source.control();
 
   {
     auto instance = source.instantiate("Ptr", {control->getCharType()});
@@ -142,7 +142,7 @@ TEST(Substitution, Variable) {
     constexpr T value = T{};
   )"_cxx;
 
-  auto control = &source.control;
+  auto control = source.control();
 
   {
     auto instance = source.instantiate("value", {control->getIntType()});
@@ -180,7 +180,7 @@ TEST(Substitution, Class) {
 
   LookupMember getMember{source};
 
-  auto control = &source.control;
+  auto control = source.control();
 
   {
     auto instance = source.instantiate("S", {control->getIntType()});