X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=b1a0ce179a62eb470db1309a94f2be4147ee9166;hp=bfe12e03098478ae32ce74bf2819c71209bec250;hb=2fad99dbed0a4ac40a5e008e94d868810d499951;hpb=ef7b2923fafd73063f2a3fc02e34a5c83f14fc0b 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";