Replace 'program_name' property with program prototype's 'name` in cpp2 generator

Summary:
Replace `foo:program_name` property with Whisker program prototype's `name` property (`foo:program.name`).

`service:program` is always non-null. `type:program` is null for primitives.

Reviewed By: iahs

Differential Revision: D90034984

fbshipit-source-id: 3663bda06346ae22e9eca0e41b4752a3d85af7dc

Author: hchokshi

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

@@ -590,10 +590,6 @@ class t_mstch_cpp2_generator : public t_mstch_generator {
     auto base = t_whisker_generator::make_prototype_for_type(proto);
     auto def = whisker::dsl::prototype_builder<h_type>::extends(base);
 
-    def.property("program_name", [](const t_type& type) {
-      return type.program() ? type.program()->name() : "";
-    });
-
     def.property("qualified_namespace", [](const t_type& type) {
       return cpp2::get_gen_unprefixed_namespace(*type.program());
     });

third-party/thrift/src/thrift/compiler/generate/templates/cpp2/ServiceAsyncClient.h.mustache

@@ -20,12 +20,12 @@
 
 #include <thrift/lib/cpp2/gen/client_h.h>
 
-#include "{{service:include_prefix}}{{service:program_name}}_types.h"
+#include "{{service:include_prefix}}{{service:program.name}}_types.h"
 {{#service:extends}}
 #if __has_include("{{service:include_prefix}}{{service:name}}AsyncClient.h")
 #include "{{service:include_prefix}}{{service:name}}AsyncClient.h"
 #else
-#include "{{service:include_prefix}}{{service:program_name}}_clients.h"
+#include "{{service:include_prefix}}{{service:program.name}}_clients.h"
 #endif
 {{/service:extends}}
 {{#service:thrift_includes}}

third-party/thrift/src/thrift/compiler/generate/templates/cpp2/common/metadata.mustache

@@ -27,7 +27,7 @@
 
   {{#else if value.structured?}}
     {{#let ttype = value.type.true_type}}
-cvStruct("{{ttype.program_name}}.{{ttype.name}}", { {{!}}
+cvStruct("{{ttype.program.name}}.{{ttype.name}}", { {{!}}
      {{#each (array.enumerate value.structured_elements with_last=true) as |i elem last?|}}
 {"{{elem.field.name}}", {{#partial cv_metadata value=elem.value}} }{{#if (not last?)}}, {{/if}}
      {{/each}}

third-party/thrift/src/thrift/compiler/generate/templates/cpp2/metadata/type_gen.mustache

@@ -15,7 +15,7 @@
   limitations under the License.
 
 }}{{#if type:typedef?}}{{!
-}}std::make_unique<Typedef>("{{type:program_name}}.{{type:cpp_name}}", {{#type:typedef_type}}{{> metadata/type_gen}}{{/type:typedef_type}}, std::vector<ThriftConstStruct>{ {{!
+}}std::make_unique<Typedef>("{{type:program.name}}.{{type:cpp_name}}", {{#type:typedef_type}}{{> metadata/type_gen}}{{/type:typedef_type}}, std::vector<ThriftConstStruct>{ {{!
   }}{{#type:typedef}}{{#each typedef:self.structured_annotations as |annot|}}{{!
   }}{{#if annot.type.structured?}}{{#partial metadata.structured_annotation value=annot.value}}, {{/if}}{{!
   }}{{/each}}{{/type:typedef}} }){{!
@@ -37,9 +37,9 @@
 }}{{#type:list?}}std::make_unique<List>({{#type:list_elem_type}}{{> metadata/type_gen}}{{/type:list_elem_type}}){{/type:list?}}{{!
 }}{{#type:set?}}std::make_unique<Set>({{#type:set_elem_type}}{{> metadata/type_gen}}{{/type:set_elem_type}}){{/type:set?}}{{!
 }}{{#type:map?}}std::make_unique<Map>({{#type:key_type}}{{> metadata/type_gen}}{{/type:key_type}}, {{#type:value_type}}{{> metadata/type_gen}}{{/type:value_type}}){{/type:map?}}{{!
-}}{{#type:enum?}}std::make_unique<Enum<{{type:cpp_standard_type}}>>("{{type:program_name}}.{{#type:enum}}{{enum:name}}{{/type:enum}}"){{/type:enum?}}{{!
+}}{{#type:enum?}}std::make_unique<Enum<{{type:cpp_standard_type}}>>("{{type:program.name}}.{{#type:enum}}{{enum:name}}{{/type:enum}}"){{/type:enum?}}{{!
 }}{{#type:structured?}}{{!
-}}{{#type:union?}}std::make_unique<Union<{{type:cpp_standard_type}}>>("{{type:program_name}}.{{type:name}}"){{/type:union?}}{{!
-}}{{^type:union?}}std::make_unique<Struct<{{type:cpp_standard_type}}>>("{{type:program_name}}.{{type:name}}"){{/type:union?}}{{!
+}}{{#type:union?}}std::make_unique<Union<{{type:cpp_standard_type}}>>("{{type:program.name}}.{{type:name}}"){{/type:union?}}{{!
+}}{{^type:union?}}std::make_unique<Struct<{{type:cpp_standard_type}}>>("{{type:program.name}}.{{type:name}}"){{/type:union?}}{{!
 }}{{/type:structured?}}{{!
 }}{{/type:primitive?}}{{/if type:typedef?}}

third-party/thrift/src/thrift/compiler/generate/templates/cpp2/service.cpp.mustache

@@ -20,9 +20,9 @@
 
 #include "{{service:include_prefix}}{{service:name}}.h"
 #include "{{service:include_prefix}}{{service:name}}.tcc"
-#include "{{service:include_prefix}}{{service:program_name}}_metadata.h"
+#include "{{service:include_prefix}}{{service:program.name}}_metadata.h"
 {{#service:has_service_schema}}
-#include "{{service:include_prefix}}{{service:program_name}}_constants.h"
+#include "{{service:include_prefix}}{{service:program.name}}_constants.h"
 {{/service:has_service_schema}}
 #include <thrift/lib/cpp2/gen/service_cpp.h>
 

third-party/thrift/src/thrift/compiler/generate/templates/cpp2/service.h.mustache

@@ -21,12 +21,12 @@
 #include <thrift/lib/cpp2/gen/service_h.h>
 
 #include "{{service:include_prefix}}{{service:name}}AsyncClient.h"
-#include "{{service:include_prefix}}{{service:program_name}}_types.h"
+#include "{{service:include_prefix}}{{service:program.name}}_types.h"
 {{#service:extends}}
 #if __has_include("{{service:include_prefix}}{{service:name}}.h")
 #include "{{service:include_prefix}}{{service:name}}.h"
 #else
-#include "{{service:include_prefix}}{{service:program_name}}_handlers.h"
+#include "{{service:include_prefix}}{{service:program.name}}_handlers.h"
 #endif
 {{/service:extends}}
 {{#service:thrift_includes}}

third-party/thrift/src/thrift/compiler/generate/templates/cpp2/types_custom_protocol.h.mustache

@@ -26,7 +26,7 @@
  */
 
 #include "{{service:include_prefix}}{{service:name}}.tcc"
-#include "{{service:include_prefix}}{{service:program_name}}_types_custom_protocol.h"
+#include "{{service:include_prefix}}{{service:program.name}}_types_custom_protocol.h"
 {{#service:extends}}
 #include "{{service:include_prefix}}{{service:name}}_custom_protocol.h"
 {{/service:extends}}