From: Jens Thiele Date: Mon, 18 Dec 2006 17:16:06 +0000 (+0000) Subject: added support for pointer to const X-Git-Tag: v0.2~19 X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=commitdiff_plain;h=2fad99dbed0a4ac40a5e008e94d868810d499951;hp=ef7b2923fafd73063f2a3fc02e34a5c83f14fc0b added support for pointer to const --- diff --git a/codegen/README b/codegen/README index 5c05067..f0be2c3 100644 --- a/codegen/README +++ b/codegen/README @@ -15,3 +15,9 @@ examples in separate packages: - this was done to be able to test that installation and configure scripts work as intended - there are two examples because one is used to generate the usage example documentation using doxygen and one is used for automatic testing +- in libt2n-examples there is a script test-built-install-use to test everything is fine + +group header file for include file dependencies: +- simple +- i don't see a solution using gccxml +- better than extracting all the includes from the file and adding them to the generated code diff --git a/codegen/TODO b/codegen/TODO index 998f2e3..eb7631c 100644 --- a/codegen/TODO +++ b/codegen/TODO @@ -6,3 +6,6 @@ => we do not provide this for now - naming scheme?! perhaps generated group class should not be prefixed by cmd_group_ +- would be nice to reduce amount of changed files + (codegen output is often the same as the existing files - something similar to ccache + for codegen - but not overwriting output files if they are the same) diff --git a/codegen/main.cpp b/codegen/main.cpp index bfe12e0..b1a0ce1 100644 --- a/codegen/main.cpp +++ b/codegen/main.cpp @@ -169,8 +169,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")); @@ -373,7 +380,8 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis 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" << " libt2n::result* operator()();\n" @@ -456,6 +464,9 @@ void output_server_cpp(std::ostream &o, const std::string &group, const std::lis 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 << ", "; + // get pointer + if (ait->second.name.find_first_of('*')!=std::string::npos) + o << '&'; o << ait->first; } o << ")); }\n";