X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=0c6090866c4c127c0de8b6db473a0ee58136a2bb;hp=052be02ba8a80bfa82c21e167faec313a32f070c;hb=29ba0e9777f576fa318decb2915bf8895bf233eb;hpb=f8b78aa868d052ca41fd2c72f5ade1a697418626

diff --git a/codegen/main.cpp b/codegen/main.cpp
index 052be02..0c60908 100644
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -3,6 +3,7 @@
 #include <iostream>
 #include <set>
 #include <fstream>
+#include <list>
 
 void print_indentation(unsigned int indentation)
 {
@@ -10,6 +11,40 @@ void print_indentation(unsigned int indentation)
 	  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());
+}
+
+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
 /*!
   \return pointer to element having id or null on error
@@ -45,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;
 
@@ -59,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<std::string, std::string> Args;
+     typedef std::list<std::pair<std::string, type_info> > Args;
 
      std::string group;
-     std::string ret_type;
+     type_info ret_type;
      std::string name;
      Args  args;
 
@@ -145,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());
@@ -164,10 +219,10 @@ 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<std::string, type_info>(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);
      }
 
@@ -292,6 +347,7 @@ void output_common_hpp(std::ostream &o, const std::list<t2n_procedure> &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";
@@ -301,7 +357,7 @@ void output_common_hpp(std::ostream &o, const std::list<t2n_procedure> &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<class Archive>\n"
@@ -339,7 +395,7 @@ void output_common_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, c
      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) {
@@ -425,19 +481,6 @@ void output_server_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, c
      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) {
@@ -486,13 +529,13 @@ main(int argc, char* argv[])
      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);