X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=fe400b2f0c7537fdae6466da3a8fffb2f9953d7b;hp=aef6d59ed9c84b7670377040b6388278235bf6ce;hb=3b7c93a8beb79498d2116969ff9c873fbe56d157;hpb=2f0896ce9a4305c9538917492faf8c78fe7b9b1a diff --git a/codegen/main.cpp b/codegen/main.cpp index aef6d59..fe400b2 100644 --- a/codegen/main.cpp +++ b/codegen/main.cpp @@ -1,3 +1,22 @@ +/* + 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 #include #include @@ -87,19 +106,14 @@ std::string get_namespace(const xmlpp::Element* root, const std::string &id) return element->get_attribute("name")->get_value(); } -//! extract group from attributes -std::string -extract_group(const std::string &attrs) +//! procedure marked for export? +bool +is_marked(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); + return (p!=std::string::npos); } struct type_info @@ -108,6 +122,7 @@ struct type_info 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) { @@ -155,8 +170,15 @@ type_info get_type(const xmlpp::Element* root, const std::string &id) 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")); @@ -188,6 +210,7 @@ struct t2n_procedure 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) { @@ -203,6 +226,20 @@ std::ostream &operator<<(std::ostream &o, const t2n_procedure &f) { return o; } +std::pair +get_file_and_line(const xmlpp::Element* root, const xmlpp::Element* element) +{ + return std::pair(get_file(root, element->get_attribute("file")->get_value()), + boost::lexical_cast(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 fl(get_file_and_line(root,element)); + return std::string(fl.first)+":"+boost::lexical_cast(fl.second); +} + class Parser { public: @@ -241,7 +278,7 @@ protected: // attributes are speparated by spaces? t2n_procedure f; - if (extract_group(attributes->get_value()).empty()) return; + if (!is_marked(attributes->get_value())) return; // we need the return type f.ret_type=get_type(root, returns->get_value()); @@ -261,13 +298,14 @@ protected: 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::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::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); } @@ -313,20 +351,24 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis for (std::list::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" + << "private:\n"; + if (it->hasReturn()) + o << " " << it->ret_type << " res;\n"; + o << " friend class boost::serialization::access;\n" << " template\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" + << " 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" - << " " << it->ret_classname() << "(const " << it->ret_type << " &_res) : res(_res) {}\n" - << " " << it->ret_type << " get_data() { return res; }\n" - << "};\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::const_iterator it=procs.begin();it!=procs.end();++it) { o << "class " << it->cmd_classname() << " : public " << groupClass(group) << "\n" @@ -351,18 +393,21 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis << " " << it->cmd_classname() << "() {}\n"; // constructor taking all arguments - o << " " << it->cmd_classname() << "("; - for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) { + 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; - } - o << ") : "; - for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) { + } + 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 << ")"; + // pointers are const pointers and must be dereferenced + o << ait->first << "(" << ((ait->second.name.find_first_of('*')!=std::string::npos) ? "*" : "" ) << "_" << ait->first << ")"; + } + o << " {}\n"; } - o << " {}\n" - << " libt2n::result* operator()();\n" + o << " libt2n::result* operator()();\n" << "};\n"; } } @@ -415,9 +460,10 @@ void output_client_cpp(std::ostream &o, const std::string &group, const std::lis } 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"; + << " 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 @@ -439,12 +485,21 @@ void output_server_cpp(std::ostream &o, const std::string &group, const std::lis for (std::list::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"; }