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
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"));
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:
// 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());
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) << ":\texport procedure: " << f << std::endl;
m_procedures.push_back(f);
}
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"
+ << "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"
- << " 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<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
o << "class " << it->cmd_classname() << " : public " << groupClass(group) << "\n"
<< " " << 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";
}
}
}
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
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() << "(";
+
+ // output function name and args
+ o << 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";
+
+ if (it->hasReturn())
+ o << "));";
+ else
+ o << "); return new " << it->ret_classname() << "();";
+
+ o << " }\n";
}
o << "#include \"" << common_cpp << "\"\n";
}
std::copy(p.begin(), p.end(), std::back_inserter(procedures));
}
- std::cerr << "Procedures:" << std::endl;
+ std::cerr << "All procedures:" << std::endl;
for (std::list<t2n_procedure>::const_iterator it=procedures.begin();it!=procedures.end();++it)
std::cerr << *it << ";" << std::endl;
git://developer.intra2net.com / libt2n / blobdiff