X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=517d14fbc44e6b0f0ae2a1a0481e654e62163c88;hp=a023eaf2e1bbadd706956cb2e5e36932197aafdb;hb=bf62f8b70a94fd7238af116f7b16cea0a8852d27;hpb=52b6f93ade9aebf4d3313a7b5fc2b63a0cc68c3d diff --git a/codegen/main.cpp b/codegen/main.cpp index a023eaf..517d14f 100644 --- a/codegen/main.cpp +++ b/codegen/main.cpp @@ -4,6 +4,8 @@ #include #include #include +#include +#include //! convert string to upper case std::string @@ -69,6 +71,15 @@ const xmlpp::Element* get_element_by_id(const xmlpp::Element* element, const std return NULL; } +std::string +get_file(const xmlpp::Element* root, const std::string &file_id) +{ + std::string error; + const xmlpp::Element* e=get_element_by_id(root, file_id); + if ((!e)||(!e->get_attribute("name"))) return error; + return e->get_attribute("name")->get_value(); +} + //! get namespace by id /*! \return namespace name or empty string on error @@ -116,6 +127,13 @@ std::ostream &operator<<(std::ostream &o, const type_info &t) { return o; } +struct parse_error : public std::runtime_error +{ + parse_error(const std::string &file, unsigned line, const std::string &msg) + : std::runtime_error(file+":"+boost::lexical_cast(line)+": error: "+msg) + {} +}; + //! get type by id /*! \return type name or empty string on error @@ -148,12 +166,21 @@ type_info get_type(const xmlpp::Element* root, const std::string &id) if (ret==error) return error; ret.name=std::string("const ")+ret.name; return ret; + }else if (tag=="PointerType") { + // not yet supported + return error; } assert(element->get_attribute("name")); type_info ret; - if (element->get_attribute("context")) - ret.name=get_namespace(root, element->get_attribute("context")->get_value())+"::"; + if (element->get_attribute("context")) { + ret.name=get_namespace(root, element->get_attribute("context")->get_value()); + if (ret.name!="::") + ret.name+="::"; + else + // do not explicitely add :: + ret.name=""; + } ret.name+=element->get_attribute("name")->get_value(); return ret; } @@ -192,7 +219,7 @@ std::ostream &operator<<(std::ostream &o, const t2n_procedure &f) { class Parser { public: - Parser(const std::string &fname) : m_fname(fname) {} + Parser(const std::string &fname, const std::string &group) : m_fname(fname), m_group(group) {} std::list get_procedures() { xmlpp::DomParser parser; @@ -211,6 +238,7 @@ public: } protected: std::string m_fname; + std::string m_group; std::list m_procedures; void parse_function(const xmlpp::Element* root, const xmlpp::Node* node) { @@ -230,7 +258,7 @@ protected: f.group=extract_group(attributes->get_value()); if (f.group.empty()) return; // todo: handle default group - if (f.group=="default") f.group=get_default_group(root); + if (f.group=="default") f.group=m_group; // we need the return type f.ret_type=get_type(root, returns->get_value()); @@ -246,6 +274,14 @@ protected: assert(arg->get_attribute("name")); assert(arg->get_attribute("type")); f.args.push_back(std::pair(arg->get_attribute("name")->get_value(), get_type(root, arg->get_attribute("type")->get_value()))); + // todo: ugly - could be any other error + if (f.args.back().second.name.empty()) { + assert(element->get_attribute("file")); + assert(element->get_attribute("line")); + throw parse_error(get_file(root, element->get_attribute("file")->get_value()), + boost::lexical_cast(element->get_attribute("line")->get_value())-1, + std::string("type of parameter `")+f.args.back().first+"' not (yet?) supported"); + } } } std::cerr << "Found function: " << f << std::endl; @@ -295,14 +331,13 @@ used_groups(const std::list &funcs) { void output_common_hpp(std::ostream &o, const std::list &procs) { std::set groups(used_groups(procs)); - o << "#include \"codegen-stubhead.hxx\"\n"; for (std::set::iterator it=groups.begin();it!=groups.end();++it) { o << "class cmd_group_" << *it << " : public libt2n::command\n" << "{\n" << "private:\n" << " friend class boost::serialization::access;\n" << " template\n" - << " void serialize(Archive & ar, const unsigned int version)\n" + << " void serialize(Archive & ar, const unsigned int /* version */)\n" << " {ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::command);}\n" << "};\n"; } @@ -314,7 +349,7 @@ void output_common_hpp(std::ostream &o, const std::list &procs) { << " " << it->ret_type << " res;\n" << " friend class boost::serialization::access;\n" << " template\n" - << " void serialize(Archive & ar, const unsigned int version)\n" + << " void serialize(Archive & ar, const unsigned int /* version */)\n" << " {\n" << " ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::result);\n" << " ar & BOOST_SERIALIZATION_NVP(res);\n" @@ -334,7 +369,7 @@ void output_common_hpp(std::ostream &o, const std::list &procs) { } o << " friend class boost::serialization::access;\n" << " template\n" - << " void serialize(Archive & ar, const unsigned int version)\n" + << " void serialize(Archive & ar, const unsigned int /* version */)\n" << " {\n" << " ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(cmd_group_" << it->group << ");\n"; for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) { @@ -439,6 +474,14 @@ void output_client_cpp(std::ostream &o, const std::list &procs, c o << "#include \"" << common_cpp << "\"\n"; } +void output_server_hpp(std::ostream &o, const std::list &procs, const std::string &common_hpp) { + o << "#include \"" << common_hpp << "\"\n"; + + // output function declarations + for (std::list::const_iterator it=procs.begin();it!=procs.end();++it) + o << *it << ";\n"; +} + void output_server_cpp(std::ostream &o, const std::list &procs, const std::string &common_hpp, const std::string &common_cpp) { o << "#include \"" << common_hpp << "\"\n"; @@ -476,47 +519,105 @@ struct cpp_file : public std::ofstream } }; -int -main(int argc, char* argv[]) +std::list +get_includes(const std::string &fname) { - if (argc != 3) { - std::cerr << "Usage: " << argv[0] << " gccxml-file outputprefix" << std::endl; - return 1; + // grep "#include" fname + std::ifstream in(fname.c_str()); + std::string line; + std::list ret; + while (std::getline(in,line)) { + if (line.find("#include")!=std::string::npos) + ret.push_back(line); } - std::string filepath(argv[1]); - std::string prefix(argv[2]); - - Parser parser(filepath); - std::list procedures(parser.get_procedures()); - - std::cerr << "Procedures:" << std::endl; - for (std::list::const_iterator it=procedures.begin();it!=procedures.end();++it) - std::cerr << *it << ";" << std::endl; - - std::set groups(used_groups(procedures)); - std::cerr << "Used groups:" << std::endl; - for (std::set::const_iterator it=groups.begin();it!=groups.end();++it) - std::cerr << *it << std::endl; - - std::string common_hpp_fname(prefix+"common.hxx"); - std::string common_cpp_fname(prefix+"common.cpp"); - std::string client_hpp_fname(prefix+"client.hxx"); - std::string client_cpp_fname(prefix+"client.cpp"); - std::string server_cpp_fname(prefix+"server.cpp"); + return ret; +} - header_file common_hpp(common_hpp_fname.c_str()); - output_common_hpp(common_hpp, procedures); +void +paste_includes(std::ostream &o, std::list &i) +{ + o << std::endl + << "// copied includes begin" << std::endl; + for (std::list::const_iterator it=i.begin(); it!=i.end(); ++it) + o << *it << std::endl; + o << "// copied includes end" << std::endl + << std::endl; +} - cpp_file common_cpp(common_cpp_fname.c_str()); - output_common_cpp(common_cpp, procedures, common_hpp_fname); +struct RemoveGenerated +{ + RemoveGenerated(const std::string &_prefix) : prefix(_prefix) {} + bool operator()(const std::string &s) const { + return (s.find(prefix+"common.hxx")!=std::string::npos); + } + const std::string &prefix; +}; - header_file client_hpp(client_hpp_fname.c_str()); - output_client_hpp(client_hpp, procedures); +int +main(int argc, char* argv[]) +{ + if (argc != 4) { + std::cerr << "Usage: " << argv[0] << " header-file gccxml-file group" << std::endl; + return 1; + } - cpp_file client_cpp(client_cpp_fname.c_str()); - output_client_cpp(client_cpp, procedures, common_hpp_fname, common_cpp_fname, client_hpp_fname); + try{ + std::string headerfile(argv[1]); + std::string xmlfile(argv[2]); + std::string group(argv[3]); + std::string prefix=group+"_"; + std::list includes(get_includes(headerfile)); + remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix)); + includes.erase(remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix)), includes.end()); - cpp_file server_cpp(server_cpp_fname.c_str()); - output_server_cpp(server_cpp, procedures, common_hpp_fname, common_cpp_fname); - return 0; + //paste_includes(std::cerr, includes); + + Parser parser(xmlfile, group); + std::list procedures(parser.get_procedures()); + + std::cerr << "Procedures:" << std::endl; + for (std::list::const_iterator it=procedures.begin();it!=procedures.end();++it) + std::cerr << *it << ";" << std::endl; + + std::set groups(used_groups(procedures)); + std::cerr << "Used groups:" << std::endl; + for (std::set::const_iterator it=groups.begin();it!=groups.end();++it) + std::cerr << *it << std::endl; + + std::string common_hpp_fname(prefix+"common.hxx"); + std::string common_cpp_fname(prefix+"common.cpp"); + std::string client_hpp_fname(prefix+"client.hxx"); + std::string client_cpp_fname(prefix+"client.cpp"); + std::string server_hpp_fname(prefix+"server.hxx"); + std::string server_cpp_fname(prefix+"server.cpp"); + + 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); + + 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); + + 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); + + 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; + } + return EXIT_SUCCESS; }