From 7bb71df6efb2529ea3f3d1baf86fb6f102ca3e4f Mon Sep 17 00:00:00 2001 From: David Reiss Date: Thu, 27 Mar 2008 21:40:08 +0000 Subject: [PATCH] Remove t_ocaml_generator.h. t_ocaml_generator.h is no longer included anywhere, because the Ocaml 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@665592 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/Makefile.am | 1 - .../cpp/src/generate/t_ocaml_generator.cc | 144 ++++++++++++++++- compiler/cpp/src/generate/t_ocaml_generator.h | 152 ------------------ 3 files changed, 143 insertions(+), 154 deletions(-) delete mode 100644 compiler/cpp/src/generate/t_ocaml_generator.h diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am index 2c672553..eed2043d 100644 --- a/compiler/cpp/Makefile.am +++ b/compiler/cpp/Makefile.am @@ -49,7 +49,6 @@ thrift_SOURCES = src/thrifty.yy \ src/generate/t_rb_generator.h \ src/generate/t_xsd_generator.h \ src/generate/t_perl_generator.h \ - src/generate/t_ocaml_generator.h \ src/generate/t_erl_generator.h \ src/generate/t_hs_generator.h \ src/generate/t_cocoa_generator.h \ diff --git a/compiler/cpp/src/generate/t_ocaml_generator.cc b/compiler/cpp/src/generate/t_ocaml_generator.cc index 88757bc3..745d8f73 100644 --- a/compiler/cpp/src/generate/t_ocaml_generator.cc +++ b/compiler/cpp/src/generate/t_ocaml_generator.cc @@ -4,14 +4,156 @@ // See accompanying file LICENSE or visit the Thrift site at: // http://developers.facebook.com/thrift/ +#include +#include +#include +#include + #include #include #include #include -#include "t_ocaml_generator.h" +#include "t_oop_generator.h" #include "platform.h" using namespace std; + +/** + * OCaml code generator. + * + * @author Iain Proctor + */ +class t_ocaml_generator : public t_oop_generator { + public: + t_ocaml_generator( + t_program* program, + const std::map& parsed_options, + const std::string& option_string) + : t_oop_generator(program) + { + out_dir_base_ = "gen-ocaml"; + } + + /** + * Init and close methods + */ + + void init_generator(); + void close_generator(); + + /** + * Program-level generation functions + */ + void generate_program (); + 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_ocaml_struct(t_struct* tstruct, bool is_exception); + void generate_ocaml_struct_definition(std::ofstream& out, t_struct* tstruct, bool is_xception=false); + void generate_ocaml_struct_sig(std::ofstream& out, t_struct* tstruct, bool is_exception); + void generate_ocaml_struct_reader(std::ofstream& out, t_struct* tstruct); + void generate_ocaml_struct_writer(std::ofstream& out, t_struct* tstruct); + void generate_ocaml_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_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); + + void generate_deserialize_struct (std::ofstream &out, + t_struct* tstruct); + + void generate_deserialize_container (std::ofstream &out, + t_type* ttype); + + void generate_deserialize_set_element (std::ofstream &out, + t_set* tset); + + + void generate_deserialize_list_element (std::ofstream &out, + t_list* tlist, + std::string prefix=""); + void generate_deserialize_type (std::ofstream &out, + t_type* type); + + void generate_serialize_field (std::ofstream &out, + t_field* tfield, + std::string name= ""); + + 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 ocaml_autogen_comment(); + std::string ocaml_imports(); + std::string type_name(t_type* ttype); + std::string function_signature(t_function* tfunction, std::string prefix=""); + std::string function_type(t_function* tfunc, bool method=false, bool options = false); + std::string argument_list(t_struct* tstruct); + std::string type_to_enum(t_type* ttype); + std::string render_ocaml_type(t_type* type); + + + private: + + /** + * File streams + */ + + std::ofstream f_types_; + std::ofstream f_consts_; + std::ofstream f_service_; + + std::ofstream f_types_i_; + std::ofstream f_service_i_; + +}; + + /* * This is necessary because we want typedefs to appear later, * after all the types have been declared. diff --git a/compiler/cpp/src/generate/t_ocaml_generator.h b/compiler/cpp/src/generate/t_ocaml_generator.h deleted file mode 100644 index 25bffdc9..00000000 --- a/compiler/cpp/src/generate/t_ocaml_generator.h +++ /dev/null @@ -1,152 +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_OCAML_GENERATOR_H -#define T_OCAML_GENERATOR_H - -#include -#include -#include -#include - -#include "t_oop_generator.h" - -/** - * OCaml code generator. - * - * @author Iain Proctor - */ -class t_ocaml_generator : public t_oop_generator { - public: - t_ocaml_generator( - t_program* program, - const std::map& parsed_options, - const std::string& option_string) - : t_oop_generator(program) - { - out_dir_base_ = "gen-ocaml"; - } - - /** - * Init and close methods - */ - - void init_generator(); - void close_generator(); - - /** - * Program-level generation functions - */ - void generate_program (); - 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_ocaml_struct(t_struct* tstruct, bool is_exception); - void generate_ocaml_struct_definition(std::ofstream& out, t_struct* tstruct, bool is_xception=false); - void generate_ocaml_struct_sig(std::ofstream& out, t_struct* tstruct, bool is_exception); - void generate_ocaml_struct_reader(std::ofstream& out, t_struct* tstruct); - void generate_ocaml_struct_writer(std::ofstream& out, t_struct* tstruct); - void generate_ocaml_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_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); - - void generate_deserialize_struct (std::ofstream &out, - t_struct* tstruct); - - void generate_deserialize_container (std::ofstream &out, - t_type* ttype); - - void generate_deserialize_set_element (std::ofstream &out, - t_set* tset); - - - void generate_deserialize_list_element (std::ofstream &out, - t_list* tlist, - std::string prefix=""); - void generate_deserialize_type (std::ofstream &out, - t_type* type); - - void generate_serialize_field (std::ofstream &out, - t_field* tfield, - std::string name= ""); - - 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 ocaml_autogen_comment(); - std::string ocaml_imports(); - std::string type_name(t_type* ttype); - std::string function_signature(t_function* tfunction, std::string prefix=""); - std::string function_type(t_function* tfunc, bool method=false, bool options = false); - std::string argument_list(t_struct* tstruct); - std::string type_to_enum(t_type* ttype); - std::string render_ocaml_type(t_type* type); - - - private: - - /** - * File streams - */ - - std::ofstream f_types_; - std::ofstream f_consts_; - std::ofstream f_service_; - - std::ofstream f_types_i_; - std::ofstream f_service_i_; - -}; - -#endif -- 2.17.1