Consolidate C++ generator code

Summary:
The current directory structure has the following problems:

* `lib` is a meaningless directory name since almost everything else in the compiler is also libraries.
* `lib` is inconsistent with the rest of the Thrift compiler which is organized by compilation phases (parsing, semantic analysis and generation).
* It is confusing because the generator logic is in multiple places, including APIs that are effectively implementation details.

Fix it by moving the C++ generator logic from `lib` to `generate` where it belongs. Together with an earlier change this consolidates all C++ generator code which was previously all over the place.

Reviewed By: yoney

Differential Revision: D64239916

fbshipit-source-id: f35b21fe8df21c8e3917db7e1a93dc5301014020

Author: vitaut

third-party/thrift/src/thrift/compiler/codemod/cppref_to_structured.cc

@@ -21,7 +21,7 @@
 #include <thrift/compiler/ast/t_struct.h>
 #include <thrift/compiler/codemod/file_manager.h>
 #include <thrift/compiler/compiler.h>
-#include <thrift/compiler/lib/cpp2/util.h>
+#include <thrift/compiler/generate/cpp/util.h>
 
 using namespace apache::thrift::compiler;
 

third-party/thrift/src/thrift/compiler/codemod/hoist_annotated_types.cc

@@ -26,7 +26,7 @@
 #include <thrift/compiler/ast/t_struct.h>
 #include <thrift/compiler/codemod/file_manager.h>
 #include <thrift/compiler/compiler.h>
-#include <thrift/compiler/lib/cpp2/util.h>
+#include <thrift/compiler/generate/cpp/util.h>
 
 using namespace apache::thrift::compiler;
 

third-party/thrift/src/thrift/compiler/codemod/specify_implicit_field_id.cc

@@ -25,7 +25,7 @@
 #include <thrift/compiler/ast/t_struct.h>
 #include <thrift/compiler/codemod/file_manager.h>
 #include <thrift/compiler/compiler.h>
-#include <thrift/compiler/lib/cpp2/util.h>
+#include <thrift/compiler/generate/cpp/util.h>
 
 using namespace apache::thrift::compiler;
 

third-party/thrift/src/thrift/compiler/codemod/structure_annotations.cc

@@ -24,7 +24,7 @@
 #include <thrift/compiler/ast/t_struct.h>
 #include <thrift/compiler/codemod/file_manager.h>
 #include <thrift/compiler/compiler.h>
-#include <thrift/compiler/lib/cpp2/util.h>
+#include <thrift/compiler/generate/cpp/util.h>
 #include <thrift/compiler/lib/uri.h>
 
 using namespace apache::thrift::compiler;

third-party/thrift/src/thrift/compiler/lib/cpp2/util.cc renamed to third-party/thrift/src/thrift/compiler/generate/cpp/util.cc

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#include <thrift/compiler/lib/cpp2/util.h>
-#include "thrift/compiler/ast/t_program.h"
+#include <thrift/compiler/generate/cpp/util.h>
 
 #include <algorithm>
 #include <functional>
@@ -32,6 +31,7 @@
 #include <thrift/compiler/ast/t_list.h>
 #include <thrift/compiler/ast/t_map.h>
 #include <thrift/compiler/ast/t_node.h>
+#include <thrift/compiler/ast/t_program.h>
 #include <thrift/compiler/ast/t_set.h>
 #include <thrift/compiler/ast/t_struct.h>
 #include <thrift/compiler/ast/t_typedef.h>

third-party/thrift/src/thrift/compiler/lib/cpp2/util.h renamed to third-party/thrift/src/thrift/compiler/generate/cpp/util.h

@@ -27,7 +27,7 @@
 
 #include <thrift/compiler/ast/t_program.h>
 #include <thrift/compiler/detail/mustache/mstch.h>
-#include <thrift/compiler/lib/cpp2/util.h>
+#include <thrift/compiler/generate/cpp/util.h>
 #include <thrift/compiler/lib/uri.h>
 #include <thrift/compiler/sema/sema_context.h>
 

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

@@ -31,9 +31,9 @@
 #include <thrift/compiler/ast/t_field.h>
 #include <thrift/compiler/generate/common.h>
 #include <thrift/compiler/generate/cpp/name_resolver.h>
+#include <thrift/compiler/generate/cpp/util.h>
 #include <thrift/compiler/generate/mstch_objects.h>
 #include <thrift/compiler/generate/t_mstch_generator.h>
-#include <thrift/compiler/lib/cpp2/util.h>
 #include <thrift/compiler/lib/schematizer.h>
 #include <thrift/compiler/lib/uri.h>
 #include <thrift/compiler/sema/ast_validator.h>

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

@@ -24,9 +24,9 @@
 #include <thrift/compiler/generate/common.h>
 #include <thrift/compiler/generate/cpp/name_resolver.h>
 #include <thrift/compiler/generate/cpp/reference_type.h>
+#include <thrift/compiler/generate/cpp/util.h>
 #include <thrift/compiler/generate/mstch_objects.h>
 #include <thrift/compiler/generate/t_mstch_generator.h>
-#include <thrift/compiler/lib/cpp2/util.h>
 #include <thrift/compiler/lib/py3/util.h>
 #include <thrift/compiler/lib/uri.h>
 

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

@@ -29,9 +29,9 @@
 #include <thrift/compiler/detail/mustache/mstch.h>
 #include <thrift/compiler/generate/common.h>
 #include <thrift/compiler/generate/cpp/name_resolver.h>
+#include <thrift/compiler/generate/cpp/util.h>
 #include <thrift/compiler/generate/mstch_objects.h>
 #include <thrift/compiler/generate/t_mstch_generator.h>
-#include <thrift/compiler/lib/cpp2/util.h>
 #include <thrift/compiler/lib/py3/util.h>
 #include <thrift/compiler/lib/python/util.h>
 #include <thrift/compiler/lib/uri.h>