From 0d6eb969e1bc58d9955e0c48af6a78fb728dfdf8 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Thu, 27 Mar 2008 21:41:45 +0000 Subject: [PATCH] Remove t_py_generator.h. t_py_generator.h is no longer included anywhere, because the Python generator uses the new dynamic generator framework. Therefore, we can collapse the class definition into the .cc file. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665613 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/Makefile.am | 1 - compiler/cpp/src/generate/t_py_generator.cc | 167 ++++++++++++++++++- compiler/cpp/src/generate/t_py_generator.h | 175 -------------------- 3 files changed, 166 insertions(+), 177 deletions(-) delete mode 100644 compiler/cpp/src/generate/t_py_generator.h diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am index fbc7dbd0..e7a5c67f 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -40,7 +40,6 @@ thrift_SOURCES = src/thrifty.yy \ src/generate/t_generator.h \ src/generate/t_oop_generator.h \ src/generate/t_php_generator.h \ - src/generate/t_py_generator.h \ src/generate/t_rb_generator.h \ src/generate/t_xsd_generator.h \ src/generate/t_perl_generator.h \ diff --git a/compiler/cpp/src/generate/t_py_generator.cc b/compiler/cpp/src/generate/t_py_generator.cc index 461ad138..4521515a 100644 --- a/compiler/cpp/src/generate/t_py_generator.cc +++ b/compiler/cpp/src/generate/t_py_generator.cc @@ -4,15 +4,180 @@ // See accompanying file LICENSE or visit the Thrift site at: // http://developers.facebook.com/thrift/ +#include +#include +#include +#include + #include #include #include #include #include -#include "t_py_generator.h" +#include "t_generator.h" #include "platform.h" using namespace std; + +/** + * Python code generator. + * + * @author Mark Slee + */ +class t_py_generator : public t_generator { + public: + t_py_generator( + t_program* program, + const std::map& parsed_options, + const std::string& option_string) + : t_generator(program) + { + std::map::const_iterator iter; + + iter = parsed_options.find("new_style"); + gen_newstyle_ = (iter != parsed_options.end()); + + out_dir_base_ = "gen-py"; + } + + /** + * Init and close methods + */ + + void init_generator(); + void close_generator(); + + /** + * Program-level generation functions + */ + + void generate_typedef (t_typedef* ttypedef); + void generate_enum (t_enum* tenum); + void generate_const (t_const* tconst); + void generate_struct (t_struct* tstruct); + void generate_xception (t_struct* txception); + void generate_service (t_service* tservice); + + std::string render_const_value(t_type* type, t_const_value* value); + + /** + * Struct generation code + */ + + void generate_py_struct(t_struct* tstruct, bool is_exception); + void generate_py_struct_definition(std::ofstream& out, t_struct* tstruct, bool is_xception=false, bool is_result=false); + void generate_py_struct_reader(std::ofstream& out, t_struct* tstruct); + void generate_py_struct_writer(std::ofstream& out, t_struct* tstruct); + void generate_py_function_helpers(t_function* tfunction); + + /** + * Service-level generation functions + */ + + void generate_service_helpers (t_service* tservice); + void generate_service_interface (t_service* tservice); + void generate_service_client (t_service* tservice); + void generate_service_remote (t_service* tservice); + void generate_service_server (t_service* tservice); + void generate_process_function (t_service* tservice, t_function* tfunction); + + /** + * Serialization constructs + */ + + void generate_deserialize_field (std::ofstream &out, + t_field* tfield, + std::string prefix="", + bool inclass=false); + + void generate_deserialize_struct (std::ofstream &out, + t_struct* tstruct, + std::string prefix=""); + + void generate_deserialize_container (std::ofstream &out, + t_type* ttype, + std::string prefix=""); + + void generate_deserialize_set_element (std::ofstream &out, + t_set* tset, + std::string prefix=""); + + void generate_deserialize_map_element (std::ofstream &out, + t_map* tmap, + std::string prefix=""); + + void generate_deserialize_list_element (std::ofstream &out, + t_list* tlist, + std::string prefix=""); + + void generate_serialize_field (std::ofstream &out, + t_field* tfield, + std::string prefix=""); + + void generate_serialize_struct (std::ofstream &out, + t_struct* tstruct, + std::string prefix=""); + + void generate_serialize_container (std::ofstream &out, + t_type* ttype, + std::string prefix=""); + + void generate_serialize_map_element (std::ofstream &out, + t_map* tmap, + std::string kiter, + std::string viter); + + void generate_serialize_set_element (std::ofstream &out, + t_set* tmap, + std::string iter); + + void generate_serialize_list_element (std::ofstream &out, + t_list* tlist, + std::string iter); + + /** + * Helper rendering functions + */ + + std::string py_autogen_comment(); + std::string py_imports(); + std::string render_includes(); + std::string render_fastbinary_includes(); + std::string declare_field(t_field* tfield); + std::string type_name(t_type* ttype); + std::string function_signature(t_function* tfunction, std::string prefix=""); + std::string argument_list(t_struct* tstruct); + std::string type_to_enum(t_type* ttype); + std::string type_to_spec_args(t_type* ttype); + + static std::string get_real_py_module(const t_program* program) { + std::string real_module = program->get_py_module(); + if (real_module.empty()) { + return program->get_name(); + } + return real_module; + } + + private: + + /** + * True iff we should generate new-style classes. + */ + bool gen_newstyle_; + + /** + * File streams + */ + + std::ofstream f_types_; + std::ofstream f_consts_; + std::ofstream f_service_; + + std::string package_dir_; + +}; + + /** * Prepares for file generation by opening up the necessary file output * streams. diff --git a/compiler/cpp/src/generate/t_py_generator.h b/compiler/cpp/src/generate/t_py_generator.h deleted file mode 100644 index a2d1c47f..00000000 --- a/compiler/cpp/src/generate/t_py_generator.h +++ /dev/null @@ -1,175 +0,0 @@ -// Copyright (c) 2006- Facebook -// Distributed under the Thrift Software License -// -// See accompanying file LICENSE or visit the Thrift site at: -// http://developers.facebook.com/thrift/ - -#ifndef T_PY_GENERATOR_H -#define T_PY_GENERATOR_H - -#include -#include -#include -#include - -#include "t_generator.h" - -/** - * Python code generator. - * - * @author Mark Slee - */ -class t_py_generator : public t_generator { - public: - t_py_generator( - t_program* program, - const std::map& parsed_options, - const std::string& option_string) - : t_generator(program) - { - std::map::const_iterator iter; - - iter = parsed_options.find("new_style"); - gen_newstyle_ = (iter != parsed_options.end()); - - out_dir_base_ = "gen-py"; - } - - /** - * Init and close methods - */ - - void init_generator(); - void close_generator(); - - /** - * Program-level generation functions - */ - - void generate_typedef (t_typedef* ttypedef); - void generate_enum (t_enum* tenum); - void generate_const (t_const* tconst); - void generate_struct (t_struct* tstruct); - void generate_xception (t_struct* txception); - void generate_service (t_service* tservice); - - std::string render_const_value(t_type* type, t_const_value* value); - - /** - * Struct generation code - */ - - void generate_py_struct(t_struct* tstruct, bool is_exception); - void generate_py_struct_definition(std::ofstream& out, t_struct* tstruct, bool is_xception=false, bool is_result=false); - void generate_py_struct_reader(std::ofstream& out, t_struct* tstruct); - void generate_py_struct_writer(std::ofstream& out, t_struct* tstruct); - void generate_py_function_helpers(t_function* tfunction); - - /** - * Service-level generation functions - */ - - void generate_service_helpers (t_service* tservice); - void generate_service_interface (t_service* tservice); - void generate_service_client (t_service* tservice); - void generate_service_remote (t_service* tservice); - void generate_service_server (t_service* tservice); - void generate_process_function (t_service* tservice, t_function* tfunction); - - /** - * Serialization constructs - */ - - void generate_deserialize_field (std::ofstream &out, - t_field* tfield, - std::string prefix="", - bool inclass=false); - - void generate_deserialize_struct (std::ofstream &out, - t_struct* tstruct, - std::string prefix=""); - - void generate_deserialize_container (std::ofstream &out, - t_type* ttype, - std::string prefix=""); - - void generate_deserialize_set_element (std::ofstream &out, - t_set* tset, - std::string prefix=""); - - void generate_deserialize_map_element (std::ofstream &out, - t_map* tmap, - std::string prefix=""); - - void generate_deserialize_list_element (std::ofstream &out, - t_list* tlist, - std::string prefix=""); - - void generate_serialize_field (std::ofstream &out, - t_field* tfield, - std::string prefix=""); - - void generate_serialize_struct (std::ofstream &out, - t_struct* tstruct, - std::string prefix=""); - - void generate_serialize_container (std::ofstream &out, - t_type* ttype, - std::string prefix=""); - - void generate_serialize_map_element (std::ofstream &out, - t_map* tmap, - std::string kiter, - std::string viter); - - void generate_serialize_set_element (std::ofstream &out, - t_set* tmap, - std::string iter); - - void generate_serialize_list_element (std::ofstream &out, - t_list* tlist, - std::string iter); - - /** - * Helper rendering functions - */ - - std::string py_autogen_comment(); - std::string py_imports(); - std::string render_includes(); - std::string render_fastbinary_includes(); - std::string declare_field(t_field* tfield); - std::string type_name(t_type* ttype); - std::string function_signature(t_function* tfunction, std::string prefix=""); - std::string argument_list(t_struct* tstruct); - std::string type_to_enum(t_type* ttype); - std::string type_to_spec_args(t_type* ttype); - - static std::string get_real_py_module(const t_program* program) { - std::string real_module = program->get_py_module(); - if (real_module.empty()) { - return program->get_name(); - } - return real_module; - } - - private: - - /** - * True iff we should generate new-style classes. - */ - bool gen_newstyle_; - - /** - * File streams - */ - - std::ofstream f_types_; - std::ofstream f_consts_; - std::ofstream f_service_; - - std::string package_dir_; - -}; - -#endif -- 2.17.1