X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=a8580baa5009721c0a430d7e2b1c4f09acfd3cc7;hp=f8a2e2390dbfa7979289bba844377556cb51e90a;hb=6be7b70f2216eb743cfd6960f7a3f0ef62eacde7;hpb=d5b431f83d0e215a590b3ec4df8ef5f212004960 diff --git a/codegen/main.cpp b/codegen/main.cpp index f8a2e23..a8580ba 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; } @@ -246,6 +273,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; @@ -301,7 +336,7 @@ void output_common_hpp(std::ostream &o, const std::list &procs) { << "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"; } @@ -313,7 +348,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" @@ -333,7 +368,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) { @@ -516,52 +551,59 @@ main(int argc, char* argv[]) std::cerr << "Usage: " << argv[0] << " header-file gccxml-file outputprefix" << std::endl; return 1; } - std::string headerfile(argv[1]); - std::string xmlfile(argv[2]); - std::string prefix(argv[3]); - 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()); - - paste_includes(std::cerr, includes); - - Parser parser(xmlfile); - 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"); - - header_file common_hpp(common_hpp_fname.c_str()); - common_hpp << "#include \"codegen-stubhead.hxx\"\n"; - paste_includes(common_hpp, includes); - output_common_hpp(common_hpp, procedures); + try{ + std::string headerfile(argv[1]); + std::string xmlfile(argv[2]); + std::string prefix(argv[3]); + 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 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()); - // we can't paste the includes before codegen-stubhead.hxx was included - // but we also do not want to include codegen-stubhead.hxx in this file - // 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 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); + 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"); + + 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); + + 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; }