compiler/cpp/src/main: Accept THRIFT_TYPES_PATH env variable

Author: AlexisMontagne

compiler/cpp/src/main.cc

@@ -28,6 +28,7 @@
  */
 
 #include <cassert>
+#include <cstdlib>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -1053,7 +1054,13 @@ int main(int argc, char** argv) {
   // Set the current path to a dummy value to make warning messages clearer.
   g_curpath = "arguments";
 
-  g_incl_searchpath.push_back(THRIFT_TYPES_PATH);
+  std::string types_path = THRIFT_TYPES_PATH;
+
+  if (const char* env_path = std::getenv("THRIFT_TYPES_PATH")) {
+    types_path = std::string(env_path);
+  }
+
+  g_incl_searchpath.push_back(types_path);
 
   // Hacky parameter handling... I didn't feel like using a library sorry!
   for (i = 1; i < argc - 1; i++) {
@@ -1175,6 +1182,7 @@ int main(int argc, char** argv) {
   }
 
   program->set_include_prefix(include_prefix);
+  program->set_std_path(types_path);
 
   // Initialize global types
   g_type_void = new t_base_type("void", t_base_type::TYPE_VOID);

compiler/cpp/src/parse/t_program.h

@@ -59,11 +59,11 @@
 class t_program : public t_doc {
 public:
   t_program(std::string path, std::string name)
-    : path_(path), name_(name), out_path_("./"), out_path_is_absolute_(false) {
+    : path_(path), name_(name), out_path_("./"), out_path_is_absolute_(false), std_path_(THRIFT_TYPES_PATH) {
     scope_ = new t_scope();
   }
 
-  t_program(std::string path) : path_(path), out_path_("./"), out_path_is_absolute_(false) {
+  t_program(std::string path) : path_(path), out_path_("./"), out_path_is_absolute_(false), std_path_(THRIFT_TYPES_PATH)  {
     name_ = program_name(path);
     scope_ = new t_scope();
   }
@@ -76,7 +76,7 @@ class t_program : public t_doc {
   }
 
   bool is_std_path() const {
-    return path_.rfind(THRIFT_TYPES_NESTED_PATH, 0) == 0;
+    return path_.rfind(std_path_ + "/types", 0) == 0;
   }
 
   // Path accessor
@@ -126,6 +126,8 @@ class t_program : public t_doc {
   // Programs to include
   const std::vector<t_program*>& get_includes() const { return includes_; }
 
+  void set_std_path(std::string std_path) { std_path_ = std_path; }
+
   void set_out_path(std::string out_path, bool out_path_is_absolute) {
     out_path_ = out_path;
     out_path_is_absolute_ = out_path_is_absolute;
@@ -367,6 +369,8 @@ class t_program : public t_doc {
   // Include prefix for this program, if any
   std::string include_prefix_;
 
+  std::string std_path_;
+
   // Identifier lookup scope
   t_scope* scope_;
 

compiler/cpp/version.h.in

@@ -1,3 +1,2 @@
 #define THRIFT_VERSION "@REPO_VERSION@"
 #define THRIFT_TYPES_PATH "@TYPES_PREFIX@"
-#define THRIFT_TYPES_NESTED_PATH "@TYPES_PREFIX@/types"