Flatten C++ namespaces in py3 generator

Summary:
- Simplify condition in `cpp_pass_field` helper
- Flatten C++ namespaces property to return a namespace string, rename to `cpp_namespace`

Reviewed By: vitaut

Differential Revision: D95888004

fbshipit-source-id: 4c4cbc22aa0c0457d0962d8744037156fb1dc0f3

Author: hchokshi

thrift/compiler/generate/t_mstch_py3_generator.cc

@@ -873,8 +873,9 @@ class t_mstch_py3_generator : public t_whisker_generator {
       }
       return whisker::make::array();
     });
-    def.property("cppNamespaces", [](const t_program& self) {
-      return to_whisker_string_array(cpp2::get_gen_namespace_components(self));
+    def.property("cpp_namespace", [](const t_program& self) {
+      return fmt::format(
+          "{}", fmt::join(cpp2::get_gen_namespace_components(self), "::"));
     });
     def.property("py3Namespaces", [](const t_program& self) {
       return to_whisker_string_array(get_py3_namespace(&self));

thrift/compiler/generate/templates/py3/clients_wrapper.cpp.mustache

@@ -28,8 +28,7 @@ thread that will pass data to the cython callback.
 
 #include <{{program.include_prefix}}gen-py3/{{program.name}}/clients_wrapper.h>
 
-{{#each program.cppNamespaces as |ns|}}namespace {{ns}} {
-{{/each}}
+namespace {{program.cpp_namespace}} {
 
 
 {{#each program.services as |service|}}
@@ -38,7 +37,7 @@ folly::Future<{{#partial clients.cpp_return_type function=function}}>
 {{service.name}}ClientWrapper::{{function.cpp_name}}(
     apache::thrift::RpcOptions& rpcOptions{{#each function.params.fields as |field|}},
     {{#partial types.cpp_value_type type=field.type}} arg_{{field.py_name}}{{/each}}) {
-  auto* client = static_cast<::{{#each service.program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{service.cpp_name}}AsyncClient*>(async_client_.get());
+  auto* client = static_cast<::{{service.program.cpp_namespace}}::{{service.cpp_name}}AsyncClient*>(async_client_.get());
   {{> clients/clients_wrapper.cpp_func_body}}
 
 }
@@ -64,14 +63,13 @@ folly::Future<{{#partial clients.cpp_return_type function=function}}>
 {{service.name}}ClientWrapper::{{interaction.name}}InteractionWrapper::{{function.cpp_name}}(
     apache::thrift::RpcOptions& rpcOptions{{#each function.params.fields as |field|}},
     {{#partial types.cpp_value_type type=field.type}} arg_{{field.py_name}}{{/each}}) {
-  auto* client = static_cast<::{{#each interaction.program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{service.cpp_name}}AsyncClient::{{interaction.name}}*>(async_client_.get());
+  auto* client = static_cast<::{{service.program.cpp_namespace}}::{{service.cpp_name}}AsyncClient::{{interaction.name}}*>(async_client_.get());
   {{> clients/clients_wrapper.cpp_func_body}}
 
 }
 
     {{/each}}
   {{/each}}
-{{/each}}{{!
-}}{{#each program.cppNamespaces as |ns|}}} // namespace {{ns}}
 {{/each}}
+} // namespace {{program.cpp_namespace}}
 {{/if (not program.auto_migrate?)}}

thrift/compiler/generate/templates/py3/clients_wrapper.h.mustache

@@ -51,15 +51,14 @@ Header file for ClientsWrapper.cpp for cython to import in CythonClients.pxd.
 #include <set>
 #include <vector>
 
-{{#each program.cppNamespaces as |ns|}}namespace {{ns}} {
-{{/each}}
+namespace {{program.cpp_namespace}} {
 
 {{#each program.services as |service|}}
 class {{service.name}}ClientWrapper : {{!
-}}{{#if (object.notnull? service.extends)}}public ::{{#each service.extends.program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{service.extends.name}}ClientWrapper{{#else}}public ::thrift::py3::ClientWrapper{{/if}} {
+}}{{#if (object.notnull? service.extends)}}public ::{{service.extends.program.cpp_namespace}}::{{service.extends.name}}ClientWrapper{{#else}}public ::thrift::py3::ClientWrapper{{/if}} {
   public:
     using {{#if (object.notnull? service.extends)}}{{!
-    }}::{{#each service.extends.program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{service.extends.name}}ClientWrapper::{{service.extends.name}}ClientWrapper{{!
+    }}::{{service.extends.program.cpp_namespace}}::{{service.extends.name}}ClientWrapper::{{service.extends.name}}ClientWrapper{{!
     }}{{#else}}::thrift::py3::ClientWrapper::ClientWrapper{{/if (object.notnull? service.extends)}};
 
 {{#each service.supportedFunctions as |function|}}
@@ -89,8 +88,6 @@ class {{service.name}}ClientWrapper : {{!
 };
 
 
-{{/each}}{{!
-}}{{#each program.cppNamespaces as |ns|}}
-} // namespace {{ns}}
 {{/each}}
+} // namespace {{program.cpp_namespace}}
 {{/if (not program.auto_migrate?)}}

thrift/compiler/generate/templates/py3/clients_wrapper.pxd.mustache

@@ -71,19 +71,13 @@ cimport {{include.modulePathPeriodSeparated}}.clients_wrapper as _{{include.modu
 {{/each}}
 
 {{#each program.services as |service|}}
-cdef extern from "{{program.include_prefix}}{{program.cpp_gen_path}}/{{program.name}}_clients.h"{{!
-    }} namespace "{{#each program.cppNamespaces as |ns|}}::{{ns}}{{/each}}":
-  cdef cppclass c{{service.name}}AsyncClient {{!
-    }}"::{{#each program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{!
-    }}{{service.cpp_name}}AsyncClient":
+cdef extern from "{{program.include_prefix}}{{program.cpp_gen_path}}/{{program.name}}_clients.h" namespace "::{{program.cpp_namespace}}":
+  cdef cppclass c{{service.name}}AsyncClient "::{{program.cpp_namespace}}::{{service.cpp_name}}AsyncClient":
       pass
 
   {{#each service.supportedInteractions as |interaction|}}
-cdef extern from "{{program.include_prefix}}{{program.cpp_gen_path}}/{{program.name}}_clients.h"{{!
-    }} namespace "{{#each program.cppNamespaces as |ns|}}::{{ns}}{{/each}}":
-  cdef cppclass c{{service.name}}AsyncClient_{{interaction.name}} {{!
-    }}"::{{#each program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{!
-    }}{{service.name}}AsyncClient::{{interaction.name}}":
+cdef extern from "{{program.include_prefix}}{{program.cpp_gen_path}}/{{program.name}}_clients.h" namespace "::{{program.cpp_namespace}}":
+  cdef cppclass c{{service.name}}AsyncClient_{{interaction.name}} "::{{program.cpp_namespace}}::{{service.name}}AsyncClient::{{interaction.name}}":
       pass
 
   {{/each}}
@@ -95,12 +89,10 @@ cdef extern from "thrift/lib/cpp/TProcessorEventHandler.h" namespace "::apache::
   cdef cppclass cTProcessorEventHandler "apache::thrift::TProcessorEventHandler":
     pass
 
-cdef extern from "{{program.include_prefix}}gen-py3/{{program.name}}/clients_wrapper.h"{{!
-    }} namespace "{{#each program.cppNamespaces as |ns|}}::{{ns}}{{/each}}":{{!
+cdef extern from "{{program.include_prefix}}gen-py3/{{program.name}}/clients_wrapper.h" namespace "::{{program.cpp_namespace}}":{{!
     }}{{#if (array.empty? program.services)}}
   pass{{/if (array.empty? program.services)}}{{#each program.services as |service|}}
-  cdef cppclass c{{service.name}}ClientWrapper "{{!
-  }}::{{#each program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{service.name}}ClientWrapper"{{#partial client_wrapper_parent service=service}}:
+  cdef cppclass c{{service.name}}ClientWrapper "::{{program.cpp_namespace}}::{{service.name}}ClientWrapper"{{#partial client_wrapper_parent service=service}}:
   {{#if (object.eq? null service.extends)}}
     void setPersistentHeader(const string& key, const string& value)
     void addEventHandler(const shared_ptr[cTProcessorEventHandler]& handler)
@@ -124,7 +116,7 @@ cdef extern from "{{program.include_prefix}}gen-py3/{{program.name}}/clients_wra
 
   {{#each service.supportedInteractions as |interaction|}}
   cdef cppclass c{{service.name}}ClientWrapper_{{interaction.name}}InteractionWrapper "{{!
-  }}::{{#each program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{service.name}}ClientWrapper{{!
+  }}::{{program.cpp_namespace}}::{{service.name}}ClientWrapper{{!
   }}::{{interaction.name}}InteractionWrapper"(cClientWrapper):
     void setPersistentHeader(const string& key, const string& value)
     void addEventHandler(const shared_ptr[cTProcessorEventHandler]& handler)

thrift/compiler/generate/templates/py3/common/types.mustache

@@ -444,7 +444,7 @@ element types.
 {{#else if type.string_or_binary?}}std::string
 {{#else if (or type.enum? type.structured?)}}
   {{#let ttype=type.true_type}}
-::{{#each ttype.program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{ttype.cpp_name}}
+::{{ttype.program.cpp_namespace}}::{{ttype.cpp_name}}
 {{#else if (or type.list? type.set?)}}
   {{#let ttype=type.true_type}}
 {{type.cppTemplate}}<{{#partial cpp_value_type type=ttype.elem_type}}>

thrift/compiler/generate/templates/py3/metadata.cpp.mustache

@@ -15,21 +15,14 @@
   limitations under the License.
 
 }}
-{{#let partial service_qualified_name |service|}}
-{{#pragma ignore-newlines}}
-{{#each service.program.cppNamespaces as |ns|}}::{{ns}}{{/each}}
-::{{service.cpp_name}}
-{{/let partial}}
 {{> common/auto_generated_c}}
 {{#if (not program.auto_migrate?)}}
 
 #include "{{program.include_prefix}}gen-py3/{{program.name}}/metadata.h"
 
 #include "{{program.include_prefix}}{{program.cpp_gen_path}}/{{program.name}}_handlers.h"
 
-  {{#each program.cppNamespaces as |ns|}}
-namespace {{ns}} {
-  {{/each}}
+namespace {{program.cpp_namespace}} {
 ::apache::thrift::metadata::ThriftMetadata {{program.name}}_getThriftModuleMetadata() {
   ::apache::thrift::metadata::ThriftServiceMetadataResponse response;
   ::apache::thrift::metadata::ThriftMetadata& metadata = *response.metadata();
@@ -45,11 +38,9 @@ namespace {{ns}} {
   {{/each}}
   {{#each program.services as |service|}}
   ::apache::thrift::detail::md::ServiceMetadata<::apache::thrift::ServiceHandler<{{!
-    }}{{#partial service_qualified_name service=service}}>>::gen(response);
+    }}::{{service.program.cpp_namespace}}::{{service.cpp_name}}>>::gen(response);
   {{/each}}
   return metadata;
 }
-  {{#each program.cppNamespaces as |ns|}}
-} // namespace {{ns}}
-  {{/each}}
+} // namespace {{program.cpp_namespace}}
 {{/if (not program.auto_migrate?)}}

thrift/compiler/generate/templates/py3/metadata.h.mustache

@@ -25,11 +25,7 @@
 
 #include "{{program.include_prefix}}{{program.cpp_gen_path}}/{{program.name}}_types.h"
 
-  {{#each program.cppNamespaces as |ns|}}
-namespace {{ns}} {
-  {{/each}}
+namespace {{program.cpp_namespace}} {
 ::apache::thrift::metadata::ThriftMetadata {{program.name}}_getThriftModuleMetadata();
-  {{#each program.cppNamespaces as |ns|}}
-} // namespace {{ns}}
-  {{/each}}
+} // namespace {{program.cpp_namespace}}
 {{/if (not program.auto_migrate?)}}

thrift/compiler/generate/templates/py3/metadata.pxd.mustache

@@ -25,5 +25,5 @@ from thrift.python.common cimport (
 
 cdef extern from "{{program.include_prefix}}gen-py3/{{program.name}}/metadata.h"{{!
 }} :
-    cdef cThriftMetadata cGetThriftModuleMetadata "{{#each program.cppNamespaces as |ns|}}::{{ns}}{{/each}}::{{program.name}}_getThriftModuleMetadata"()
+    cdef cThriftMetadata cGetThriftModuleMetadata "::{{program.cpp_namespace}}::{{program.name}}_getThriftModuleMetadata"()
 {{/if (not program.auto_migrate?)}}

thrift/compiler/generate/templates/py3/services/cpp_pass_field.mustache

@@ -15,17 +15,12 @@
   limitations under the License.
 
 }}{{!
-
 defines how a variable in a field should be passed into another c++ function
 from the current function. ie, when calling some_func(a, b, c), the variables
 a, b, and c would be written using this file. Most variables can be passed
 as themselves by value, but the complex types are unique_ptr values and
 need to be moved to the called function.
-
 }}
 {{#pragma ignore-newlines}}
-  {{#if (or field.type.bool? field.type.byte? field.type.i16? field.type.i32? field.type.i64? field.type.double? field.type.float? field.type.enum?)}}
-{{field.cpp_name}}
-  {{#else if (or field.type.string? field.type.binary? field.type.structured? field.type.container?)}}
-std::move({{field.cpp_name}})
-  {{/if (or field.type.bool? field.type.byte? field.type.i16? field.type.i32? field.type.i64? field.type.double? field.type.float? field.type.enum?)}}
+  {{#let should_move=(or field.type.string? field.type.binary? field.type.structured? field.type.container?)}}
+{{#if should_move}}std::move({{field.cpp_name}}){{#else}}{{field.cpp_name}}{{/if}}

thrift/compiler/generate/templates/py3/services_interface.pxd.mustache

@@ -24,11 +24,8 @@ Reflection functions for clients and services
 
   {{#each program.services as |service|}}
 
-cdef extern from "{{program.include_prefix}}{{program.cpp_gen_path}}/{{program.name}}_handlers.h"{{!
-    }} namespace "{{#each program.cppNamespaces as |ns|}}::{{ns}}{{/each}}":
-    cdef cppclass c{{service.cpp_name}}SvIf {{!
-      }}"::{{#each program.cppNamespaces as |ns|}}{{ns}}::{{/each}}{{!
-      }}{{service.cpp_name}}SvIf":
+cdef extern from "{{program.include_prefix}}{{program.cpp_gen_path}}/{{program.name}}_handlers.h" namespace "::{{program.cpp_namespace}}":
+    cdef cppclass c{{service.cpp_name}}SvIf "::{{program.cpp_namespace}}::{{service.cpp_name}}SvIf":
         pass
   {{/each}}
 {{/if (not program.auto_migrate?)}}