From 861869b73435d9673a2df94d1ddb480670192674 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Thu, 27 Mar 2008 21:41:23 +0000 Subject: [PATCH] Make the C# generator dynamic. - Modify the C# generator constructor to fit the new generic interface. - Register the C# genrator with the central registry. - Deprecate the old way of invoking the C# generator. - main.cc no longer includes t_csharp_generator.h. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665608 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_csharp_generator.cc | 3 +++ compiler/cpp/src/generate/t_csharp_generator.h | 7 ++++++- compiler/cpp/src/main.cc | 15 +++++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/compiler/cpp/src/generate/t_csharp_generator.cc b/compiler/cpp/src/generate/t_csharp_generator.cc index 786fd508..3084a693 100644 --- a/compiler/cpp/src/generate/t_csharp_generator.cc +++ b/compiler/cpp/src/generate/t_csharp_generator.cc @@ -1549,3 +1549,6 @@ string t_csharp_generator::type_to_enum(t_type* type) { throw "INVALID TYPE IN type_to_enum: " + type->get_name(); } + + +THRIFT_REGISTER_GENERATOR(csharp, "C#", ""); diff --git a/compiler/cpp/src/generate/t_csharp_generator.h b/compiler/cpp/src/generate/t_csharp_generator.h index 63ec4479..21c4b824 100644 --- a/compiler/cpp/src/generate/t_csharp_generator.h +++ b/compiler/cpp/src/generate/t_csharp_generator.h @@ -16,7 +16,12 @@ class t_csharp_generator : public t_oop_generator { public: - t_csharp_generator(t_program* program) : t_oop_generator(program) { + t_csharp_generator( + t_program* program, + const std::map& parsed_options, + const std::string& option_string) + : t_oop_generator(program) + { out_dir_base_ = "gen-csharp"; } void init_generator(); diff --git a/compiler/cpp/src/main.cc b/compiler/cpp/src/main.cc index 34990356..00457787 100644 --- a/compiler/cpp/src/main.cc +++ b/compiler/cpp/src/main.cc @@ -41,7 +41,6 @@ #include "generate/t_xsd_generator.h" #include "generate/t_perl_generator.h" #include "generate/t_erl_generator.h" -#include "generate/t_csharp_generator.h" using namespace std; @@ -609,7 +608,6 @@ void usage() { fprintf(stderr, " -xsd Generate XSD output files\n"); fprintf(stderr, " -perl Generate Perl output files\n"); fprintf(stderr, " -erl Generate Erlang output files\n"); - fprintf(stderr, " -csharp Generate C# 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"); @@ -907,13 +905,6 @@ void generate(t_program* program, const vector& generator_strings) { delete erl; } - if (gen_csharp) { - pverbose("Generating C#\n"); - t_csharp_generator* csharp = new t_csharp_generator(program); - csharp->generate_program(); - delete csharp; - } - if (dump_docs) { dump_docstrings(program); } @@ -1107,6 +1098,10 @@ int main(int argc, char** argv) { pwarning(1, "-javabean is deprecated. Use --gen java:beans"); generator_strings.push_back("java:beans"); } + if (gen_csharp) { + pwarning(1, "-csharp is deprecated. Use --gen csharp"); + generator_strings.push_back("csharp"); + } if (gen_cocoa) { pwarning(1, "-cocoa is deprecated. Use --gen cocoa"); generator_strings.push_back("cocoa"); @@ -1125,7 +1120,7 @@ int main(int argc, char** argv) { } // You gotta generate something! - if (!gen_php && !gen_phpi && !gen_py && !gen_rb && !gen_xsd && !gen_perl && !gen_erl && !gen_csharp && generator_strings.empty()) { + if (!gen_php && !gen_phpi && !gen_py && !gen_rb && !gen_xsd && !gen_perl && !gen_erl && generator_strings.empty()) { fprintf(stderr, "!!! No output language(s) specified\n\n"); usage(); } -- 2.17.1