From a204783a0625eb9cc8bdfe5ee86e31251b563369 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Tue, 17 Feb 2009 20:27:54 +0000 Subject: [PATCH] Make the Erlang generator dynamic. - Modify the Erlang generator constructor to fit the new generic interface. - Register the Erlang genrator with the central registry. - Deprecate the old way of invoking the Erlang generator. - main.cc no longer includes t_erl_generator.h. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@745231 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_erl_generator.cc | 2 ++ compiler/cpp/src/generate/t_erl_generator.h | 7 +++++-- compiler/cpp/src/main.cc | 15 +++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler/cpp/src/generate/t_erl_generator.cc b/compiler/cpp/src/generate/t_erl_generator.cc index 74c673d2..6fec5124 100644 --- a/compiler/cpp/src/generate/t_erl_generator.cc +++ b/compiler/cpp/src/generate/t_erl_generator.cc @@ -781,3 +781,5 @@ std::string t_erl_generator::generate_type_term(t_type* type, std::string t_erl_generator::type_module(t_type* ttype) { return uncapitalize(ttype->get_program()->get_name()) + "_types"; } + +THRIFT_REGISTER_GENERATOR(erl, "Erlang", ""); diff --git a/compiler/cpp/src/generate/t_erl_generator.h b/compiler/cpp/src/generate/t_erl_generator.h index 79ac3755..d8f2d1a7 100644 --- a/compiler/cpp/src/generate/t_erl_generator.h +++ b/compiler/cpp/src/generate/t_erl_generator.h @@ -15,8 +15,11 @@ */ class t_erl_generator : public t_generator { public: - t_erl_generator(t_program* program) : - t_generator(program) + t_erl_generator( + t_program* program, + const std::map& parsed_options, + const std::string& option_string) + : t_generator(program) { program_name_[0] = tolower(program_name_[0]); service_name_[0] = tolower(service_name_[0]); diff --git a/compiler/cpp/src/main.cc b/compiler/cpp/src/main.cc index 1728facf..5ac96278 100644 --- a/compiler/cpp/src/main.cc +++ b/compiler/cpp/src/main.cc @@ -39,7 +39,6 @@ #include "generate/t_generator.h" #include "generate/t_php_generator.h" #include "generate/t_xsd_generator.h" -#include "generate/t_erl_generator.h" #include "version.h" @@ -612,7 +611,6 @@ void usage() { fprintf(stderr, " -phpa Generate PHP with autoload (with -php)\n"); fprintf(stderr, " -phpo Generate PHP with object oriented subclasses (with -php)\n"); fprintf(stderr, " -xsd Generate XSD output files\n"); - fprintf(stderr, " -erl Generate Erlang output files\n"); fprintf(stderr, " -o dir Set the output directory for gen-* packages\n"); fprintf(stderr, " (default: current directory)\n"); fprintf(stderr, " -I dir Add a directory to the list of directories\n"); @@ -882,13 +880,6 @@ void generate(t_program* program, const vector& generator_strings) { delete xsd; } - if (gen_erl) { - pverbose("Generating Erlang\n"); - t_erl_generator* erl = new t_erl_generator(program); - erl->generate_program(); - delete erl; - } - if (dump_docs) { dump_docstrings(program); } @@ -1111,6 +1102,10 @@ int main(int argc, char** argv) { pwarning(1, "-cocoa is deprecated. Use --gen cocoa"); generator_strings.push_back("cocoa"); } + if (gen_erl) { + pwarning(1, "-erl is deprecated. Use --gen erl"); + generator_strings.push_back("erl"); + } if (gen_st) { pwarning(1, "-st is deprecated. Use --gen st"); generator_strings.push_back("st"); @@ -1125,7 +1120,7 @@ int main(int argc, char** argv) { } // You gotta generate something! - if (!gen_php && !gen_phpi && !gen_xsd && !gen_erl && generator_strings.empty()) { + if (!gen_php && !gen_phpi && !gen_xsd && generator_strings.empty()) { fprintf(stderr, "!!! No output language(s) specified\n\n"); usage(); } -- 2.17.1