#include <set>
#include <fstream>
#include <list>
+#include <stdexcept>
+#include <boost/lexical_cast.hpp>
//! convert string to upper case
std::string
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
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<const xmlpp::Element*>(*iter)) {
- std::string ret(get_default_group(elem));
- if (!ret.empty()) return ret;
- }
- }
- return error;
-}
-
struct type_info
{
std::string name;
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<std::string>(line)+": error: "+msg)
+ {}
+};
+
//! get type by id
/*!
\return type name or empty string on error
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;
}
class Parser
{
public:
- Parser(const std::string &fname) : m_fname(fname) {}
+ Parser(const std::string &fname, const std::string &default_group) : m_fname(fname), m_default_group(default_group) {}
std::list<t2n_procedure> get_procedures() {
xmlpp::DomParser parser;
}
protected:
std::string m_fname;
+ std::string m_default_group;
std::list<t2n_procedure> m_procedures;
void parse_function(const xmlpp::Element* root, const xmlpp::Node* node) {
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=get_default_group(root);
+ if (f.group=="default") f.group=m_default_group;
// we need the return type
f.ret_type=get_type(root, returns->get_value());
assert(arg->get_attribute("name"));
assert(arg->get_attribute("type"));
f.args.push_back(std::pair<std::string, type_info>(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<unsigned>(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;
void output_common_hpp(std::ostream &o, const std::list<t2n_procedure> &procs) {
std::set<std::string> groups(used_groups(procs));
- o << "#include \"codegen-stubhead.hxx\"\n";
for (std::set<std::string>::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<class Archive>\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";
}
<< " " << it->ret_type << " res;\n"
<< " friend class boost::serialization::access;\n"
<< " template<class Archive>\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"
}
o << " friend class boost::serialization::access;\n"
<< " template<class Archive>\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) {
o << "#include \"" << common_cpp << "\"\n";
}
+void output_server_hpp(std::ostream &o, const std::list<t2n_procedure> &procs, const std::string &common_hpp) {
+ o << "#include \"" << common_hpp << "\"\n";
+
+ // output function declarations
+ for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it)
+ o << *it << ";\n";
+}
+
void output_server_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, const std::string &common_hpp, const std::string &common_cpp) {
o << "#include \"" << common_hpp << "\"\n";
int
main(int argc, char* argv[])
{
- if (argc != 3) {
- std::cerr << "Usage: " << argv[0] << " gccxml-file outputprefix" << std::endl;
+ if (argc < 3) {
+ std::cerr << "Usage: " << argv[0] << "default-group gccxml-file1 gccxml-file2 ... " << std::endl;
return 1;
}
- std::string filepath(argv[1]);
- std::string prefix(argv[2]);
-
- Parser parser(filepath);
- std::list<t2n_procedure> procedures(parser.get_procedures());
-
- std::cerr << "Procedures:" << std::endl;
- for (std::list<t2n_procedure>::const_iterator it=procedures.begin();it!=procedures.end();++it)
- std::cerr << *it << ";" << std::endl;
-
- std::set<std::string> groups(used_groups(procedures));
- std::cerr << "Used groups:" << std::endl;
- for (std::set<std::string>::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());
- 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());
- 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;
+
+ try{
+ std::string group(argv[1]);
+ std::list<std::string> xmlfiles;
+ for (int i=2;i<argc;++i)
+ xmlfiles.push_back(argv[i]);
+
+ std::string prefix=group+"_";
+ std::list<t2n_procedure> procedures;
+ for (std::list<std::string>::iterator it=xmlfiles.begin();it!=xmlfiles.end();++it) {
+ Parser parser(*it, group);
+ const std::list<t2n_procedure> &p(parser.get_procedures());
+ std::copy(p.begin(), p.end(), std::back_inserter(procedures));
+ }
+
+ std::cerr << "Procedures:" << std::endl;
+ for (std::list<t2n_procedure>::const_iterator it=procedures.begin();it!=procedures.end();++it)
+ std::cerr << *it << ";" << std::endl;
+
+ std::set<std::string> groups(used_groups(procedures));
+ std::cerr << "Used groups:" << std::endl;
+ for (std::set<std::string>::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"
+ << "#include \"" << group << ".hxx\"\n";
+
+ 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"
+ << "#include \"" << group << ".hxx\"\n";
+ 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;
}