From 25924caeef56c6e09e73216885912ac525ebec9f Mon Sep 17 00:00:00 2001 From: Jens Thiele Date: Mon, 27 Nov 2006 15:14:25 +0000 Subject: [PATCH] cleanup - removed LIBT2N_SET_DEFAULTGROUP(x) --- codegen/TODO | 5 ++- codegen/codegen-stubhead.hxx | 5 --- codegen/main.cpp | 71 ++++++++++++++--------------------------- 3 files changed, 27 insertions(+), 54 deletions(-) diff --git a/codegen/TODO b/codegen/TODO index 88ae114..a80c9af 100644 --- a/codegen/TODO +++ b/codegen/TODO @@ -1,3 +1,4 @@ -- nice error reporting (references, pointers, ...) - configure.in sed s,CODEGEN,XMLPP, oder so - +- one group splitted into multiple .cpp files (=> add support for multiple xml input files) +- remove support for LIBT2N_EXPORT_GROUP(group) (this will simplify the generator a lot) +- add option similar to gccs -MD diff --git a/codegen/codegen-stubhead.hxx b/codegen/codegen-stubhead.hxx index fa9947f..8445551 100644 --- a/codegen/codegen-stubhead.hxx +++ b/codegen/codegen-stubhead.hxx @@ -12,14 +12,9 @@ #include #ifdef __GCCXML__ -#define LIBT2N_SET_DEFAULTGROUP(x) namespace { typedef __attribute((gccxml("libt2n-"#x))) int libt2n_default_group; } -/* not allowed anymore -#define LIBT2N_SET_DEFAULTGROUP(x) #define LIBT2N_EXPORT __attribute((gccxml("libt2n-"#x))) -*/ #define LIBT2N_EXPORT __attribute((gccxml("libt2n-default"))) #define LIBT2N_EXPORT_GROUP(group) __attribute((gccxml("libt2n-"#group))) #else -#define LIBT2N_SET_DEFAULTGROUP(x) #define LIBT2N_EXPORT #define LIBT2N_EXPORT_GROUP(group) #endif diff --git a/codegen/main.cpp b/codegen/main.cpp index 517d14f..e3ce124 100644 --- a/codegen/main.cpp +++ b/codegen/main.cpp @@ -92,28 +92,6 @@ std::string get_namespace(const xmlpp::Element* root, const std::string &id) return element->get_attribute("name")->get_value(); } -//! get default group -std::string get_default_group(const xmlpp::Element* root) { - std::string error; - - if ( (root->get_attribute("name")) - && (root->get_attribute("attributes")) - && (root->get_name() == "Typedef") - && (root->get_attribute("name")->get_value()=="libt2n_default_group")) - return extract_group(root->get_attribute("attributes")->get_value()); - - //Recurse through child nodes: - xmlpp::Node::NodeList list = root->get_children(); - for(xmlpp::Node::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter) - { - if (const xmlpp::Element* elem=dynamic_cast(*iter)) { - std::string ret(get_default_group(elem)); - if (!ret.empty()) return ret; - } - } - return error; -} - struct type_info { std::string name; @@ -219,7 +197,7 @@ std::ostream &operator<<(std::ostream &o, const t2n_procedure &f) { class Parser { public: - Parser(const std::string &fname, const std::string &group) : m_fname(fname), m_group(group) {} + Parser(const std::string &fname, const std::string &default_group) : m_fname(fname), m_default_group(default_group) {} std::list get_procedures() { xmlpp::DomParser parser; @@ -238,7 +216,7 @@ public: } protected: std::string m_fname; - std::string m_group; + std::string m_default_group; std::list m_procedures; void parse_function(const xmlpp::Element* root, const xmlpp::Node* node) { @@ -257,8 +235,7 @@ protected: t2n_procedure f; f.group=extract_group(attributes->get_value()); if (f.group.empty()) return; - // todo: handle default group - if (f.group=="default") f.group=m_group; + if (f.group=="default") f.group=m_default_group; // we need the return type f.ret_type=get_type(root, returns->get_value()); @@ -557,16 +534,16 @@ int main(int argc, char* argv[]) { if (argc != 4) { - std::cerr << "Usage: " << argv[0] << " header-file gccxml-file group" << std::endl; + std::cerr << "Usage: " << argv[0] << " export-file gccxml-file default-group" << std::endl; return 1; } try{ - std::string headerfile(argv[1]); + std::string exportfile(argv[1]); std::string xmlfile(argv[2]); std::string group(argv[3]); std::string prefix=group+"_"; - std::list includes(get_includes(headerfile)); + std::list includes(get_includes(exportfile)); remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix)); includes.erase(remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix)), includes.end()); @@ -594,30 +571,30 @@ main(int argc, char* argv[]) header_file common_hpp(common_hpp_fname.c_str()); common_hpp << "// boost serialization is picky about order of include files => we have to include this one first\n" << "#include \"codegen-stubhead.hxx\"\n"; - paste_includes(common_hpp, includes); - - output_common_hpp(common_hpp, procedures); + paste_includes(common_hpp, includes); + + output_common_hpp(common_hpp, procedures); - cpp_file common_cpp(common_cpp_fname.c_str()); - output_common_cpp(common_cpp, procedures, common_hpp_fname); + cpp_file common_cpp(common_cpp_fname.c_str()); + output_common_cpp(common_cpp, procedures, common_hpp_fname); - header_file client_hpp(client_hpp_fname.c_str()); - client_hpp << "// boost serialization is picky about order of include files => we have to include this one first\n" - << "#include \"codegen-stubhead.hxx\"\n"; - paste_includes(client_hpp, includes); - output_client_hpp(client_hpp, procedures); + header_file client_hpp(client_hpp_fname.c_str()); + client_hpp << "// boost serialization is picky about order of include files => we have to include this one first\n" + << "#include \"codegen-stubhead.hxx\"\n"; + paste_includes(client_hpp, includes); + output_client_hpp(client_hpp, procedures); - cpp_file client_cpp(client_cpp_fname.c_str()); - output_client_cpp(client_cpp, procedures, common_hpp_fname, common_cpp_fname, client_hpp_fname); + cpp_file client_cpp(client_cpp_fname.c_str()); + output_client_cpp(client_cpp, procedures, common_hpp_fname, common_cpp_fname, client_hpp_fname); - header_file server_hpp(server_hpp_fname.c_str()); - output_server_hpp(server_hpp, procedures, common_hpp_fname); + header_file server_hpp(server_hpp_fname.c_str()); + output_server_hpp(server_hpp, procedures, common_hpp_fname); - cpp_file server_cpp(server_cpp_fname.c_str()); - output_server_cpp(server_cpp, procedures, common_hpp_fname, common_cpp_fname); + cpp_file server_cpp(server_cpp_fname.c_str()); + output_server_cpp(server_cpp, procedures, common_hpp_fname, common_cpp_fname); }catch(const parse_error &e){ - std::cerr << e.what() << std::endl; - return EXIT_FAILURE; + std::cerr << e.what() << std::endl; + return EXIT_FAILURE; } return EXIT_SUCCESS; } -- 1.7.1