X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=0c6090866c4c127c0de8b6db473a0ee58136a2bb;hp=84718fe0a16489ef99f878883e24b2008168fdd2;hb=29ba0e9777f576fa318decb2915bf8895bf233eb;hpb=060fbd87ead596b4e18bfe67af55270b43f53534 diff --git a/codegen/main.cpp b/codegen/main.cpp index 84718fe..0c60908 100644 --- a/codegen/main.cpp +++ b/codegen/main.cpp @@ -3,6 +3,7 @@ #include #include #include +#include void print_indentation(unsigned int indentation) { @@ -10,7 +11,39 @@ void print_indentation(unsigned int indentation) std::cout << " "; } +std::string +toupper(std::string s) { + for (unsigned i=0; is.length() ) || ( std::string(s,0,prefix.length())!=prefix ) ) return error; + return std::string(s, prefix.length(), s.length()-prefix.length()); +} + +std::string +extract_group(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); +} //! get child element by id /*! @@ -47,13 +80,27 @@ std::string get_namespace(const xmlpp::Element* root, const std::string &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.empty() ? name : 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; @@ -61,33 +108,40 @@ std::string get_type(const xmlpp::Element* root, const std::string &id) // if we recurse - when do we stop? // if it is a typedef? yes? (hmm if the typedef is in the file parsed this will not work) - // TODO: const and reference types (perhaps it is good enough to remove the const and &?) - // non-const reference types/pointers (output error message? not yet supported) + // TODO: const and reference types handling is a ugly hack 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; + if (element->get_attribute("context")) + ret.name=get_namespace(root, element->get_attribute("context")->get_value())+"::"; + ret.name+=element->get_attribute("name")->get_value(); + return ret; } struct t2n_procedure { - typedef std::map Args; + typedef std::list > Args; std::string group; - std::string ret_type; + type_info ret_type; std::string name; Args args; @@ -147,12 +201,11 @@ protected: // check wether the procedure is marked (TODO: improve) // attributes are speparated by spaces? - if (attributes->get_value().find("gccxml(libt2n")==std::string::npos) return; - // TODO: extract command group - // something like: sed 's,gccxml(libt2n-\([a-z]*}),\1,' t2n_procedure f; - f.group=("default"); + f.group=extract_group(attributes->get_value()); + if (f.group.empty()) return; + // todo: handle default group // we need the return type f.ret_type=get_type(root, returns->get_value()); @@ -166,17 +219,16 @@ protected: assert(arg->get_name() == "Argument"); assert(arg->get_attribute("name")); assert(arg->get_attribute("type")); - assert(f.args.find(arg->get_attribute("name")->get_value())==f.args.end()); - f.args[arg->get_attribute("name")->get_value()]=get_type(root, arg->get_attribute("type")->get_value()); + f.args.push_back(std::pair(arg->get_attribute("name")->get_value(), get_type(root, arg->get_attribute("type")->get_value()))); } } + std::cerr << "Found function: " << f << std::endl; m_procedures.push_back(f); } 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(node); const xmlpp::TextNode* nodeText = dynamic_cast(node); @@ -189,13 +241,14 @@ protected: 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); @@ -242,7 +295,7 @@ protected: } } - +#endif if(!nodeContent) { //Recurse through child nodes: @@ -294,6 +347,7 @@ void output_common_hpp(std::ostream &o, const std::list &procs) { << " 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"; @@ -303,7 +357,7 @@ void output_common_hpp(std::ostream &o, const std::list &procs) { << "{\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\n" @@ -341,7 +395,7 @@ void output_common_cpp(std::ostream &o, const std::list &procs, c std::set groups(used_groups(procs)); o << "#include \"" << common_hpp << "\"\n" - << "#include \n" + << "#include \n" << "\n" << "/* register types with boost serialization */\n"; for (std::set::iterator it=groups.begin();it!=groups.end();++it) { @@ -427,19 +481,6 @@ void output_server_cpp(std::ostream &o, const std::list &procs, c o << "#include \"" << common_cpp << "\"\n"; } - -std::string -toupper(std::string s) { - for (unsigned i=0; i 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 procedures(parser.get_procedures()); @@ -483,18 +525,17 @@ main(int argc, char* argv[]) for (std::set::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);