+/*
+ Copyright (C) 2006
+ intra2net.com
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
#include <libxml++/libxml++.h>
#include <cassert>
#include <iostream>
#include <list>
#include <stdexcept>
#include <boost/lexical_cast.hpp>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
+//! map group to class name
+std::string
+groupClass(const std::string &group) {
+ return std::string("cmd_group_")+group;
+}
//! convert string to upper case
std::string
return std::string(s, prefix.length(), s.length()-prefix.length());
}
-//! extract group from attributes
-std::string
-extract_group(const std::string &attrs)
-{
- // todo: improve this
- std::string error;
- std::string to_match("gccxml(libt2n-");
- std::string::size_type p(attrs.find(to_match));
- if (p==std::string::npos) return error;
- std::string group(attrs, p+to_match.length(), attrs.length());
- p=group.find_first_of(')');
- assert(p!=std::string::npos);
- return std::string(group,0,p);
-}
-
//! get child element by id
/*!
\return pointer to element having id or null on error
return element->get_attribute("name")->get_value();
}
+//! procedure marked for export?
+bool
+is_marked(const std::string &attrs)
+{
+ // todo: improve this
+ std::string to_match("gccxml(libt2n-");
+ std::string::size_type p(attrs.find(to_match));
+ return (p!=std::string::npos);
+}
+
struct type_info
{
std::string name;
std::string noref_name;
bool operator==(const type_info& o) {return (name==o.name) && (noref_name == o.noref_name);}
std::string noref() const {return noref_name.empty() ? name : noref_name;}
+ bool isVoid() const {return name=="void";}
};
std::ostream &operator<<(std::ostream &o, const type_info &t) {
ret.name=std::string("const ")+ret.name;
return ret;
}else if (tag=="PointerType") {
- // not yet supported
- return error;
+ // todo: nearly the same as reference type handling
+ assert(element->get_attribute("type"));
+ type_info ret(get_type(root, element->get_attribute("type")->get_value()));
+ if (ret==error) return error;
+ // at the moment we only support const &
+ // todo: nice error message!
+ if ((ret.noref_name=strip(ret.name,"const ")).empty()) return error;
+ ret.name=ret.name+"*";
+ return ret;
}
assert(element->get_attribute("name"));
{
typedef std::list<std::pair<std::string, type_info> > Args;
- std::string group;
type_info ret_type;
std::string name;
std::string mangled;
std::string cmd_classname() const {
return name+mangled+"_cmd";
}
+ bool hasReturn() const {return !ret_type.isVoid();}
};
std::ostream &operator<<(std::ostream &o, const t2n_procedure::Args &args) {
return o;
}
+std::pair<std::string, unsigned>
+get_file_and_line(const xmlpp::Element* root, const xmlpp::Element* element)
+{
+ return std::pair<std::string, unsigned>(get_file(root, element->get_attribute("file")->get_value()),
+ boost::lexical_cast<unsigned>(element->get_attribute("line")->get_value())-1);
+}
+
+std::string
+get_file_and_line_as_string(const xmlpp::Element* root, const xmlpp::Element* element)
+{
+ std::pair<std::string, unsigned> fl(get_file_and_line(root,element));
+ return std::string(fl.first)+":"+boost::lexical_cast<std::string>(fl.second);
+}
+
class Parser
{
public:
- Parser(const std::string &fname, const std::string &default_group) : m_fname(fname), m_default_group(default_group) {}
+ Parser(const std::string &fname) : m_fname(fname) {}
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) {
// attributes are speparated by spaces?
t2n_procedure f;
- f.group=extract_group(attributes->get_value());
- if (f.group.empty()) return;
- if (f.group=="default") f.group=m_default_group;
+ if (!is_marked(attributes->get_value())) return;
// we need the return type
f.ret_type=get_type(root, returns->get_value());
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::pair<std::string, unsigned> file_and_line(get_file_and_line(root, element));
+ throw parse_error(file_and_line.first,
+ file_and_line.second,
std::string("type of parameter `")+f.args.back().first+"' not (yet?) supported");
}
}
}
- std::cerr << "Found function: " << f << std::endl;
+ std::cerr << get_file_and_line_as_string(root, element) << ": found procedure: " << f << std::endl;
m_procedures.push_back(f);
}
}
};
-//! find used groups
-std::set<std::string>
-used_groups(const std::list<t2n_procedure> &funcs) {
- typedef std::set<std::string> Groups;
- Groups groups;
- for (std::list<t2n_procedure>::const_iterator it=funcs.begin();it!=funcs.end();++it)
- // since we use std::set each group is inserted only once
- groups.insert(it->group);
- return groups;
-}
-
-void output_common_hpp(std::ostream &o, const std::list<t2n_procedure> &procs) {
- std::set<std::string> groups(used_groups(procs));
-
- 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"
- << " {ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::command);}\n"
- << "};\n";
- }
+void output_common_hpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs) {
+ o << "class " << groupClass(group) << " : 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"
+ << " {ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::command);}\n"
+ << "};\n";
- for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
- o << "class " << it->ret_classname() << " : public libt2n::result\n"
- << "{\n"
- << "private:\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"
- << " {\n"
- << " ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::result);\n"
- << " ar & BOOST_SERIALIZATION_NVP(res);\n"
- << " }\n"
- << "public:\n"
- << " " << it->ret_classname() << "() {}\n"
- << " " << it->ret_classname() << "(const " << it->ret_type << " &_res) : res(_res) {}\n"
- << " " << it->ret_type << " get_data() { return res; }\n"
- << "};\n";
- }
- for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
- o << "class " << it->cmd_classname() << " : public " << "cmd_group_" << it->group << "\n"
- << "{\n"
- << "private:\n";
- for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
- o << " " << ait->second.noref() << " " << ait->first << ";\n";
- }
- o << " friend class boost::serialization::access;\n"
- << " template<class Archive>\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 << " ar & BOOST_SERIALIZATION_NVP(" << ait->first << ");\n";
- }
-
- // default constructor
- o << " }\n"
- << "\n"
- << "public:\n"
- << " " << it->cmd_classname() << "() {}\n";
-
- // constructor taking all arguments
+ for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
+ o << "class " << it->ret_classname() << " : public libt2n::result\n"
+ << "{\n"
+ << "private:\n";
+ if (it->hasReturn())
+ o << " " << it->ret_type << " res;\n";
+ o << " friend class boost::serialization::access;\n"
+ << " template<class Archive>\n"
+ << " void serialize(Archive & ar, const unsigned int /* version */)\n"
+ << " {\n"
+ << " ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::result);\n";
+ if (it->hasReturn())
+ o << " ar & BOOST_SERIALIZATION_NVP(res);\n";
+ o << " }\n"
+ << "public:\n"
+ << " " << it->ret_classname() << "() {}\n";
+ if (it->hasReturn()) {
+ o << " " << it->ret_classname() << "(const " << it->ret_type << " &_res) : res(_res) {}\n"
+ << " " << it->ret_type << " get_data() { return res; }\n";
+ }
+ o << "};\n";
+ }
+ for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
+ o << "class " << it->cmd_classname() << " : public " << groupClass(group) << "\n"
+ << "{\n"
+ << "private:\n";
+ for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+ o << " " << ait->second.noref() << " " << ait->first << ";\n";
+ }
+ o << " friend class boost::serialization::access;\n"
+ << " template<class Archive>\n"
+ << " void serialize(Archive & ar, const unsigned int /* version */)\n"
+ << " {\n"
+ << " ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(" << groupClass(group) << ");\n";
+ for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+ o << " ar & BOOST_SERIALIZATION_NVP(" << ait->first << ");\n";
+ }
+
+ // default constructor
+ o << " }\n"
+ << "\n"
+ << "public:\n"
+ << " " << it->cmd_classname() << "() {}\n";
+
+ // constructor taking all arguments
+ if (!it->args.empty()) {
o << " " << it->cmd_classname() << "(";
for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
- if (ait!=it->args.begin()) o << ", ";
- o << ait->second << " _" << ait->first;
+ if (ait!=it->args.begin()) o << ", ";
+ o << ait->second << " _" << ait->first;
}
o << ") : ";
for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
- if (ait!=it->args.begin()) o << ", ";
- o << ait->first << "(_" << ait->first << ")";
+ if (ait!=it->args.begin()) o << ", ";
+ // pointers are const pointers and must be dereferenced
+ o << ait->first << "(" << ((ait->second.name.find_first_of('*')!=std::string::npos) ? "*" : "" ) << "_" << ait->first << ")";
}
- o << " {}\n"
- << " libt2n::result* operator()();\n"
- << "};\n";
- }
+ o << " {}\n";
+ }
+ o << " libt2n::result* operator()();\n"
+ << "};\n";
+ }
}
-void output_common_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, const std::string &common_hpp) {
- std::set<std::string> groups(used_groups(procs));
-
+void output_common_cpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs, const std::string &common_hpp) {
o << "#include \"" << common_hpp << "\"\n"
<< "#include <boost/serialization/export.hpp>\n"
<< "\n"
<< "/* register types with boost serialization */\n";
- for (std::set<std::string>::iterator it=groups.begin();it!=groups.end();++it) {
- o << "BOOST_CLASS_EXPORT(cmd_group_" << *it << ")\n";
- }
+ o << "BOOST_CLASS_EXPORT(" << groupClass(group) << ")\n";
for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
o << "BOOST_CLASS_EXPORT("<<it->ret_classname()<<")\n"
<< "BOOST_CLASS_EXPORT("<<it->cmd_classname()<<")\n";
}
}
-void output_client_hpp(std::ostream &o, const std::list<t2n_procedure> &procs) {
- std::set<std::string> groups(used_groups(procs));
-
+void output_client_hpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs) {
o << "#include <command_client.hxx>\n";
- for (std::set<std::string>::iterator it=groups.begin();it!=groups.end();++it) {
- o << "class cmd_group_" << *it << "_client : public libt2n::command_client\n"
- << "{\n"
- << "public:\n"
- << "cmd_group_" << *it << "_client(libt2n::client_connection &_c,\n"
- << " long long _command_timeout_usec=command_timeout_usec_default,\n"
- << " long long _hello_timeout_usec=hello_timeout_usec_default)\n"
- << " : libt2n::command_client(_c,_command_timeout_usec,_hello_timeout_usec)\n"
- << " {}\n";
- for (std::list<t2n_procedure>::const_iterator pit=procs.begin();pit!=procs.end();++pit) {
- if (pit->group==*it) {
- o << " " << *pit << ";\n";
- }
- }
- o << "};\n";
+ o << "class " << groupClass(group) << "_client : public libt2n::command_client\n"
+ << "{\n"
+ << "public:\n"
+ << groupClass(group) << "_client(libt2n::client_connection &_c,\n"
+ << " long long _command_timeout_usec=command_timeout_usec_default,\n"
+ << " long long _hello_timeout_usec=hello_timeout_usec_default)\n"
+ << " : libt2n::command_client(_c,_command_timeout_usec,_hello_timeout_usec)\n"
+ << " {}\n";
+ for (std::list<t2n_procedure>::const_iterator pit=procs.begin();pit!=procs.end();++pit) {
+ o << " " << *pit << ";\n";
}
+ o << "};\n";
}
-void output_client_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, const std::string &common_hpp, const std::string &common_cpp, const std::string &client_hpp) {
- std::set<std::string> groups(used_groups(procs));
-
+void output_client_cpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs, const std::string &common_hpp, const std::string &common_cpp, const std::string &client_hpp) {
o << "#include \"" << client_hpp << "\"\n"
<< "#include \"" << common_hpp << "\"\n"
<< "// fake\n";
o << "libt2n::result* " << it->cmd_classname() << "::operator()() { return NULL; }\n";
}
- for (std::set<std::string>::iterator it=groups.begin();it!=groups.end();++it) {
- for (std::list<t2n_procedure>::const_iterator pit=procs.begin();pit!=procs.end();++pit) {
- if (pit->group==*it) {
- o << pit->ret_type << " cmd_group_" << *it << "_client::" << pit->name << "(" << pit->args << ")\n"
- << "{\n"
- << " libt2n::result_container rc;\n"
- << " send_command(new " << pit->cmd_classname() << "(";
- for (t2n_procedure::Args::const_iterator ait=pit->args.begin();ait!=pit->args.end();++ait) {
- if (ait!=pit->args.begin()) o << ", ";
- o << ait->first;
- }
- o << "), rc);\n"
- << " " << pit->ret_classname() << "* res=dynamic_cast<" << pit->ret_classname() << "*>(rc.get_result());\n"
- << " if (!res) throw libt2n::t2n_communication_error(\"result object of wrong type\");\n"
- << " return res->get_data();\n"
- << "}\n";
- }
- }
+ for (std::list<t2n_procedure>::const_iterator pit=procs.begin();pit!=procs.end();++pit) {
+ o << pit->ret_type << " " << groupClass(group) << "_client::" << pit->name << "(" << pit->args << ")\n"
+ << "{\n"
+ << " libt2n::result_container rc;\n"
+ << " send_command(new " << pit->cmd_classname() << "(";
+ for (t2n_procedure::Args::const_iterator ait=pit->args.begin();ait!=pit->args.end();++ait) {
+ if (ait!=pit->args.begin()) o << ", ";
+ o << ait->first;
+ }
+ o << "), rc);\n"
+ << " " << pit->ret_classname() << "* res=dynamic_cast<" << pit->ret_classname() << "*>(rc.get_result());\n"
+ << " if (!res) throw libt2n::t2n_communication_error(\"result object of wrong type\");\n";
+ if (pit->hasReturn())
+ o << " return res->get_data();\n";
+ o << "}\n";
}
// include in this compilation unit to ensure the compilation unit is used
o << "#include \"" << common_cpp << "\"\n";
}
-void output_server_hpp(std::ostream &o, const std::list<t2n_procedure> &procs, const std::string &common_hpp) {
+void output_server_hpp(std::ostream &o, const std::string & /* group */, const std::list<t2n_procedure> &procs, const std::string &common_hpp) {
o << "#include \"" << common_hpp << "\"\n";
// output function declarations
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) {
+void output_server_cpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs, const std::string &common_hpp, const std::string &common_cpp) {
o << "#include \"" << common_hpp << "\"\n";
for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
o << *it << ";\n";
- o << "libt2n::result* " << it->cmd_classname() << "::operator()() { return new " << it->ret_classname() << "(" << it->name << "(";
- for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
- if (ait!=it->args.begin()) o << ", ";
- o << ait->first;
+ o << "libt2n::result* " << it->cmd_classname() << "::operator()() { ";
+ if (it->hasReturn()) {
+ o << "return new " << it->ret_classname() << "(" << it->name << "(";
+ for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+ if (ait!=it->args.begin()) o << ", ";
+ // get pointer
+ if (ait->second.name.find_first_of('*')!=std::string::npos)
+ o << '&';
+ o << ait->first;
+ }
+ o << "));";
+ }else{
+ o << it->name << "(); return new " << it->ret_classname() << "();";
}
- o << ")); }\n";
+ o << " }\n";
}
o << "#include \"" << common_cpp << "\"\n";
}
header_file(const char* fname) : std::ofstream(fname) {
std::cerr << "create header: '" << fname << "'" << std::endl;
std::string macro(replace(toupper(fname),'.','_'));
- *this << "// automatically generated code - do not edit\n" << std::endl;
+ *this << "// automatically generated code (generated by libt2n-codegen " << VERSION << ") - do not edit\n" << std::endl;
*this << "#ifndef " << macro << "\n"
<< "#define " << macro << "\n";
}
int
main(int argc, char* argv[])
{
- if (argc < 3) {
- std::cerr << "Usage: " << argv[0] << "default-group gccxml-file1 gccxml-file2 ... " << std::endl;
- return 1;
- }
-
- try{
+ // todo: maybe use getopt
+ if ((argc>1)&&(std::string(argv[1])=="--version")) {
+ std::cerr << VERSION << std::endl;
+ return 0;
+ }
+ if (argc < 3)
+ {
+ std::cerr << "Usage: " << argv[0] << "default-group gccxml-file1 gccxml-file2 ... " << std::endl;
+ return 1;
+ }
+
+ try{
std::string group(argv[1]);
std::list<std::string> xmlfiles;
for (int i=2;i<argc;++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 << "Parse " << *it << std::endl;
+ Parser parser(*it);
+ 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");
<< "#include \"codegen-stubhead.hxx\"\n"
<< "#include \"" << group << ".hxx\"\n";
- output_common_hpp(common_hpp, procedures);
+ output_common_hpp(common_hpp, group, procedures);
cpp_file common_cpp(common_cpp_fname.c_str());
- output_common_cpp(common_cpp, procedures, common_hpp_fname);
+ output_common_cpp(common_cpp, group, 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);
+ output_client_hpp(client_hpp, group, 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);
+ output_client_cpp(client_cpp, group, 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);
+ output_server_hpp(server_hpp, group, 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);
+ output_server_cpp(server_cpp, group, procedures, common_hpp_fname, common_cpp_fname);
}catch(const parse_error &e){
std::cerr << e.what() << std::endl;
return EXIT_FAILURE;
git://developer.intra2net.com / libt2n / blobdiff