std::cout << " ";
}
+std::string
+toupper(std::string s) {
+ for (unsigned i=0; i<s.length(); ++i) s[i]=toupper(s[i]);
+ return s;
+}
+
+std::string
+replace(std::string s, char f, char r) {
+ for (unsigned i=0; i<s.length(); ++i) if (s[i]==f) s[i]=r;
+ return s;
+}
+std::string
+strip(std::string s, std::string prefix)
+{
+ std::string error;
+ if ( (prefix.length()>s.length() ) || ( std::string(s,0,prefix.length())!=prefix ) ) return error;
+ return std::string(s, prefix.length(), s.length()-prefix.length());
+}
//! get child element by id
/*!
return element->get_attribute("name")->get_value();
}
+
+struct type_info
+{
+ std::string name;
+ 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;}
+};
+
+std::ostream &operator<<(std::ostream &o, const type_info &t) {
+ o << t.name;
+ return o;
+}
+
//! get type by id
/*!
\return type name or empty string on error
*/
-std::string get_type(const xmlpp::Element* root, const std::string &id)
+type_info get_type(const xmlpp::Element* root, const std::string &id)
{
- std::string error;
+ type_info error;
const xmlpp::Element* element(get_element_by_id(root, id));
if (!element) return error;
std::string tag(element->get_name());
if (tag=="ReferenceType") {
assert(element->get_attribute("type"));
- std::string ret(get_type(root, element->get_attribute("type")->get_value()));
+ type_info ret(get_type(root, element->get_attribute("type")->get_value()));
if (ret==error) return error;
- return ret+"&";
+ // 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;
}else if (tag=="CvQualifiedType") {
assert(element->get_attribute("type"));
- std::string ret(get_type(root, element->get_attribute("type")->get_value()));
+ type_info ret(get_type(root, element->get_attribute("type")->get_value()));
if (ret==error) return error;
- return std::string("const ")+ret;
+ ret.name=std::string("const ")+ret.name;
+ return ret;
}
assert(element->get_attribute("name"));
assert(element->get_attribute("context"));
- return get_namespace(root, element->get_attribute("context")->get_value())+"::"+element->get_attribute("name")->get_value();
+ type_info ret;
+ ret.name=get_namespace(root, element->get_attribute("context")->get_value())+"::"+element->get_attribute("name")->get_value();
+ return ret;
}
struct t2n_procedure
{
- typedef std::map<std::string, std::string> Args;
+ typedef std::map<std::string, type_info> Args;
std::string group;
- std::string ret_type;
+ type_info ret_type;
std::string name;
Args args;
void visit_node(const xmlpp::Element* root, const xmlpp::Node* node = NULL, unsigned int indentation = 0)
{
if (!node) node=root;
- std::cout << std::endl; //Separate nodes by an empty line.
const xmlpp::ContentNode* nodeContent = dynamic_cast<const xmlpp::ContentNode*>(node);
const xmlpp::TextNode* nodeText = dynamic_cast<const xmlpp::TextNode*>(node);
if(!nodeText && !nodeComment && !nodename.empty()) //Let's not say "name: text".
{
- print_indentation(indentation);
+ // print_indentation(indentation);
// std::cout << "Node name = " << node->get_name() << std::endl;
// std::cout << "Node name = " << nodename << std::endl;
if (node->get_name() == "Function") {
parse_function(root, node);
}
}
+#if 0
else if(nodeText) //Let's say when it's text. - e.g. let's say what that white space is.
{
print_indentation(indentation);
}
}
-
+#endif
if(!nodeContent)
{
//Recurse through child nodes:
<< " ar & BOOST_SERIALIZATION_NVP(res);\n"
<< " }\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";
<< "{\n"
<< "private:\n";
for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
- o << " " << ait->second << " " << ait->first << ";\n";
+ o << " " << ait->second.noref() << " " << ait->first << ";\n";
}
o << " friend class boost::serialization::access;\n"
<< " template<class Archive>\n"
std::set<std::string> groups(used_groups(procs));
o << "#include \"" << common_hpp << "\"\n"
- << "#include <boost/serialization/export.hxx>\n"
+ << "#include <boost/serialization/export.hpp>\n"
<< "\n"
<< "/* register types with boost serialization */\n";
for (std::set<std::string>::iterator it=groups.begin();it!=groups.end();++it) {
o << "#include \"" << common_cpp << "\"\n";
}
-
-std::string
-toupper(std::string s) {
- for (unsigned i=0; i<s.length(); ++i) s[i]=toupper(s[i]);
- return s;
-}
-
-std::string
-replace(std::string s, char f, char r) {
- for (unsigned i=0; i<s.length(); ++i) if (s[i]==f) s[i]=r;
- return s;
-}
-
struct header_file : public std::ofstream
{
header_file(const char* fname) : std::ofstream(fname) {
int
main(int argc, char* argv[])
{
- std::string filepath;
- if(argc > 1 )
- filepath = argv[1]; //Allow the user to specify a different XML file to parse.
- else
- filepath = "example.xml";
+ if (argc != 3) {
+ std::cerr << "Usage: " << argv[0] << " gccxml-file outputprefix" << std::endl;
+ return 1;
+ }
+ std::string filepath(argv[1]);
+ std::string prefix(argv[2]);
Parser parser(filepath);
std::list<t2n_procedure> procedures(parser.get_procedures());
for (std::set<std::string>::const_iterator it=groups.begin();it!=groups.end();++it)
std::cerr << *it << std::endl;
- std::string prefix("test_");
std::string common_hpp_fname(prefix+"common.hxx");
std::string common_cpp_fname(prefix+"common.cpp");
std::string client_hpp_fname(prefix+"client.hxx");
std::string client_cpp_fname(prefix+"client.cpp");
- std::string server_cpp_fname(prefix+"client.cpp");
+ std::string server_cpp_fname(prefix+"server.cpp");
header_file common_hpp(common_hpp_fname.c_str());
output_common_hpp(common_hpp, procedures);
cpp_file common_cpp(common_cpp_fname.c_str());
- output_common_cpp(common_cpp, procedures, "common-stub.hxx");
+ output_common_cpp(common_cpp, procedures, common_hpp_fname);
header_file client_hpp(client_hpp_fname.c_str());
output_client_hpp(client_hpp, procedures);
git://developer.intra2net.com / libt2n / blobdiff