Merge t_whisker_base_generator and t_whisker_generator

Summary: Merge `t_whisker_base_generator` and `t_whisker_generator`, making `t_mstch_generator` inherit from `t_whisker_generator` and merge globals from the latter. This is done to make `t_<node>` functions available in mstch generators for the incremental migration to Whisker and getting rid of the intermediate `mstch_<node>` layer. Currently this is a noop because no functions are registered yet.

Reviewed By: praihan

Differential Revision: D70255300

fbshipit-source-id: 97f01723dd91622074e903fb04d4d893bc9d7745

Author: vitaut

third-party/thrift/src/thrift/compiler/generate/t_mstch_generator.cc

@@ -415,7 +415,7 @@ mstch::map t_mstch_generator::prepend_prefix(
 
 whisker::map t_mstch_generator::globals() const {
   auto options = render_options();
-  whisker::map result;
+  whisker::map result = t_whisker_generator::globals();
   for (const auto& undefined_name : options.allowed_undefined_variables) {
     result.insert({undefined_name, whisker::make::null});
   }

third-party/thrift/src/thrift/compiler/generate/t_mstch_generator.h

@@ -31,9 +31,9 @@
 
 namespace apache::thrift::compiler {
 
-class t_mstch_generator : public t_whisker_base_generator {
+class t_mstch_generator : public t_whisker_generator {
  public:
-  using t_whisker_base_generator::t_whisker_base_generator;
+  using t_whisker_generator::t_whisker_generator;
 
   void process_options(
       const std::map<std::string, std::string>& options) override {
@@ -70,7 +70,7 @@ class t_mstch_generator : public t_whisker_base_generator {
    */
   const std::string& get_template(const std::string& template_name);
 
-  using t_whisker_base_generator::render;
+  using t_whisker_generator::render;
   /**
    * Render the mstch template with name `template_name` in the given context.
    */
@@ -219,7 +219,7 @@ class t_mstch_generator : public t_whisker_base_generator {
    */
   std::map<std::string, std::string> options_;
 
-  whisker::map globals() const final;
+  whisker::map globals() const final override;
   strictness_options strictness() const final;
 
   /**

third-party/thrift/src/thrift/compiler/generate/t_whisker_generator.cc

@@ -273,8 +273,8 @@ class whisker_source_parser : public whisker::source_resolver {
 
 } // namespace
 
-/* static */ const t_whisker_base_generator::templates_map&
-t_whisker_base_generator::templates_by_path() {
+/* static */ const t_whisker_generator::templates_map&
+t_whisker_generator::templates_by_path() {
   static const auto cached_result = [] {
     templates_map result;
     for (std::size_t i = 0; i < templates_size; ++i) {
@@ -297,8 +297,7 @@ t_whisker_base_generator::templates_by_path() {
   return cached_result;
 }
 
-t_whisker_base_generator::cached_render_state&
-t_whisker_base_generator::render_state() {
+t_whisker_generator::cached_render_state& t_whisker_generator::render_state() {
   if (!cached_render_state_) {
     whisker::render_options options;
 
@@ -331,7 +330,7 @@ t_whisker_base_generator::render_state() {
   return *cached_render_state_;
 }
 
-std::string t_whisker_base_generator::render(
+std::string t_whisker_generator::render(
     std::string_view template_file, const whisker::object& context) {
   cached_render_state& state = render_state();
   const whisker::ast::root* ast = state.source_resolver->resolve_import(
@@ -350,7 +349,7 @@ std::string t_whisker_base_generator::render(
   return out.str();
 }
 
-void t_whisker_base_generator::write_to_file(
+void t_whisker_generator::write_to_file(
     const std::filesystem::path& output_file, std::string_view data) {
   auto abs_path = detail::make_abs_path(fs_path(get_out_dir()), output_file);
   std::filesystem::create_directories(abs_path.parent_path());
@@ -370,7 +369,7 @@ void t_whisker_base_generator::write_to_file(
   record_genfile(abs_path.string());
 }
 
-void t_whisker_base_generator::render_to_file(
+void t_whisker_generator::render_to_file(
     const std::filesystem::path& output_file,
     std::string_view template_file,
     const whisker::object& context) {

third-party/thrift/src/thrift/compiler/generate/t_whisker_generator.h

@@ -60,14 +60,9 @@
 namespace apache::thrift::compiler {
 
 /**
- * Base class for all template-based code generators using Whisker as the
- * templating engine.
- *
- * This class serves as the basis for both:
- *   - t_mstch_generator, the legacy mstch-based generator
- *   - t_whisker_generator, the pure Whisker-based generator
+ * A template-based code generator that uses Whisker as the templating engine.
  */
-class t_whisker_base_generator : public t_generator {
+class t_whisker_generator : public t_generator {
  public:
   using t_generator::t_generator;
 
@@ -82,7 +77,7 @@ class t_whisker_base_generator : public t_generator {
    * The global context used for whisker rendering. This function can be used,
    * for example, to add globally available helper functions.
    */
-  virtual whisker::map globals() const { return {}; }
+  virtual whisker::map globals() const;
 
   // See whisker::render_options
   struct strictness_options {
@@ -145,21 +140,6 @@ class t_whisker_base_generator : public t_generator {
       std::string_view template_file,
       const whisker::object& context);
 
- private:
-  struct cached_render_state {
-    whisker::diagnostics_engine diagnostic_engine;
-    std::shared_ptr<whisker::source_resolver> source_resolver;
-    whisker::render_options render_options;
-  };
-  std::optional<cached_render_state> cached_render_state_;
-  cached_render_state& render_state();
-};
-
-class t_whisker_generator : public t_whisker_base_generator {
- public:
-  using t_whisker_base_generator::t_whisker_base_generator;
-
- protected:
   // Whisker-based code generators are designed to work directly against the
   // Thrift AST node types (t_<node_type> classes). This is different from the
   // mstch-based code generators which have an additional conversion layer from
@@ -286,8 +266,14 @@ class t_whisker_generator : public t_whisker_base_generator {
       h_program>;
   using h_node = make_handle<t_node, h_named>;
 
- public:
-  whisker::map globals() const override;
+ private:
+  struct cached_render_state {
+    whisker::diagnostics_engine diagnostic_engine;
+    std::shared_ptr<whisker::source_resolver> source_resolver;
+    whisker::render_options render_options;
+  };
+  std::optional<cached_render_state> cached_render_state_;
+  cached_render_state& render_state();
 };
 
 } // namespace apache::thrift::compiler