X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=2e377ec52ad4f12aebc0a5d5dd1923dfafa0fa9a;hp=ac4b9e907141744dde7f61e606fd0d768c896d2b;hb=039e52da9b40d0e729360ff0a953dfbddf975b8a;hpb=1770469ce5de50d787c6ae439e5148ce9269818f diff --git a/codegen/main.cpp b/codegen/main.cpp index ac4b9e9..2e377ec 100644 --- a/codegen/main.cpp +++ b/codegen/main.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #ifdef HAVE_CONFIG_H #include "config.h" @@ -201,9 +202,16 @@ type_info get_type(const xmlpp::Element* root, const std::string &id) return ret; } +struct Arg +{ + std::string name; + type_info type; + std::string defaultArg; +}; + struct t2n_procedure { - typedef std::list > Args; + typedef std::list Args; type_info ret_type; std::string name; @@ -226,7 +234,10 @@ std::ostream &operator<<(std::ostream &o, const t2n_procedure::Args &args) for (t2n_procedure::Args::const_iterator it=args.begin();it!=args.end();++it) { if (it!=args.begin()) o << ", "; - o << it->second << " " << it->first; + o << it->type << " " << it->name; + + if (!it->defaultArg.empty()) + o << "=" << it->defaultArg; } return o; } @@ -303,20 +314,45 @@ protected: const xmlpp::Element* arg = dynamic_cast(*iter); if ( arg ) { + struct Arg a; + assert(arg->get_name() == "Argument"); + assert(arg->get_attribute("name")); + a.name=arg->get_attribute("name")->get_value(); + 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()))); + a.type=get_type(root, arg->get_attribute("type")->get_value()); + + // this would be the nice way of solving the problem of default arguments + // but currently the output of gccxml is unreliable (e.g. namespace only + // sometimes available) + // if(arg->get_attribute("default")) + // a.defaultArg=arg->get_attribute("default")->get_value(); + + // so we need to get the def. arg. via attribute + // which is previously set by the macro LIBT2N_DEFAULT_ARG(type,value) + if(arg->get_attribute("attributes")) + { + std::string attr=arg->get_attribute("attributes")->get_value(); + const std::string look_for = "gccxml(libt2n-default-arg,"; + + if (attr.compare(0,look_for.size(),look_for) == 0) + a.defaultArg=attr.substr(look_for.size(),attr.size()-look_for.size()-1); + } + // todo: ugly - could be any other error - if (f.args.back().second.name.empty()) + if (a.type.name.empty()) { assert(element->get_attribute("file")); assert(element->get_attribute("line")); std::pair 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::string("type of parameter '")+a.name+"' not (yet?) supported"); } + + f.args.push_back(a); } } std::cerr << get_file_and_line_as_string(root, element) << ":\texport procedure: " << f << std::endl; @@ -394,7 +430,7 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis << "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 << " " << ait->type.noref() << " " << ait->name << ";\n"; } o << " friend class boost::serialization::access;\n" << " template\n" @@ -403,7 +439,7 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis << " 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"; + o << " ar & BOOST_SERIALIZATION_NVP(" << ait->name << ");\n"; } // default constructor @@ -419,14 +455,14 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis 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; + o << ait->type << " _" << ait->name; } o << ") : "; for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) { 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 << ait->name << "(" << ((ait->type.name.find_first_of('*')!=std::string::npos) ? "*" : "" ) << "_" << ait->name << ")"; } o << " {}\n"; } @@ -456,7 +492,7 @@ void output_client_hpp(std::ostream &o, const std::string &group, const std::lis o << "class " << groupClass(group) << "_client : public libt2n::command_client\n" << "{\n" << "public:\n" - << groupClass(group) << "_client(libt2n::client_connection &_c,\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" @@ -480,14 +516,24 @@ void output_client_cpp(std::ostream &o, const std::string &group, const std::lis for (std::list::const_iterator pit=procs.begin();pit!=procs.end();++pit) { - o << pit->ret_type << " " << groupClass(group) << "_client::" << pit->name << "(" << pit->args << ")\n" + o << pit->ret_type << " " << groupClass(group) << "_client::" << pit->name << "("; + + // we need to do this by hand here because we don't want default arguments within the cpp + for (t2n_procedure::Args::const_iterator xit=pit->args.begin();xit!=pit->args.end();++xit) + { + if (xit!=pit->args.begin()) + o << ", "; + o << xit->type << " " << xit->name; + } + + o << ")\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 << ait->name; } o << "), rc);\n" << " " << pit->ret_classname() << "* res=dynamic_cast<" << pit->ret_classname() << "*>(rc.get_result());\n" @@ -530,9 +576,9 @@ void output_server_cpp(std::ostream &o, const std::string &group, const std::lis { if (ait!=it->args.begin()) o << ", "; // get pointer - if (ait->second.name.find_first_of('*')!=std::string::npos) + if (ait->type.name.find_first_of('*')!=std::string::npos) o << '&'; - o << ait->first; + o << ait->name; } if (it->hasReturn())