X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=85c56ebee340afb096f15333c482081a8cd4fa4f;hp=84718fe0a16489ef99f878883e24b2008168fdd2;hb=85106017e48b4dfdec213dc2ff83486edfa7ea10;hpb=060fbd87ead596b4e18bfe67af55270b43f53534

diff --git a/codegen/main.cpp b/codegen/main.cpp
index 84718fe..85c56eb 100644
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -3,14 +3,50 @@
 #include <iostream>
 #include <set>
 #include <fstream>
+#include <list>
+#include <stdexcept>
+#include <boost/lexical_cast.hpp>
 
-void print_indentation(unsigned int indentation)
-{
-     for(unsigned int i = 0; i < indentation; ++i)
-	  std::cout << " ";
+//! convert string to upper case
+std::string
+toupper(std::string s) {
+     for (unsigned i=0; i<s.length(); ++i) s[i]=toupper(s[i]);
+     return s;
+}
+
+//! replace all characters f by r in string 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;
 }
 
+//! strip prefix from string s
+/*!
+  \return string s without prefix or an empty string on error
+ */
+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());
+}
 
+//! extract group from attributes
+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
 /*!
@@ -35,6 +71,15 @@ const xmlpp::Element* get_element_by_id(const xmlpp::Element* element, const std
      return NULL;
 }
 
+std::string
+get_file(const xmlpp::Element* root, const std::string &file_id)
+{
+     std::string error;
+     const xmlpp::Element* e=get_element_by_id(root, file_id);
+     if ((!e)||(!e->get_attribute("name"))) return error;
+     return e->get_attribute("name")->get_value();
+}
+
 //! get namespace by id
 /*!
   \return namespace name or empty string on error
@@ -47,13 +92,33 @@ 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;
+}
+
+struct parse_error : public std::runtime_error
+{
+     parse_error(const std::string &file, unsigned line, const std::string &msg)
+	  : std::runtime_error(file+":"+boost::lexical_cast<std::string>(line)+": error: "+msg)
+	  {}
+};
+
 //! 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,41 +126,58 @@ 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;
+     }else if (tag=="PointerType") {
+	  // not yet supported
+	  return error;
      }
 
      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());
+	  if (ret.name!="::")
+	       ret.name+="::";
+	  else
+	       // do not explicitely add ::
+	       ret.name="";
+     }
+     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;
+     std::string mangled;
      Args  args;
 
      std::string ret_classname() const {
-	  return name+"_res";
+	  return name+mangled+"_res";
      }
      std::string cmd_classname() const {
-	  return name+"_cmd";
+	  return name+mangled+"_cmd";
      }
 };
 
@@ -115,7 +197,7 @@ std::ostream &operator<<(std::ostream &o, const t2n_procedure &f) {
 class Parser
 {
 public:
-     Parser(const std::string &fname) : m_fname(fname) {}
+     Parser(const std::string &fname, const std::string &default_group) : m_fname(fname), m_default_group(default_group) {}
 
      std::list<t2n_procedure> get_procedures() {
 	  xmlpp::DomParser parser;
@@ -134,6 +216,7 @@ public:
      }
 protected:
      std::string m_fname;
+     std::string m_default_group;
      std::list<t2n_procedure> m_procedures;
 
      void parse_function(const xmlpp::Element* root, const xmlpp::Node* node) {
@@ -142,21 +225,22 @@ protected:
 
 	  const xmlpp::Attribute* attributes = element->get_attribute("attributes");
 	  const xmlpp::Attribute* name = element->get_attribute("name");
+	  const xmlpp::Attribute* mangled = element->get_attribute("mangled");
 	  const xmlpp::Attribute* returns = element->get_attribute("returns");
-	  if ((!attributes)||(!name)||(!returns)) return;
+	  if ((!attributes)||(!name)||(!mangled)||(!returns)) return;
 
 	  // 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;
+	  if (f.group=="default") f.group=m_default_group;
 
 	  // we need the return type
 	  f.ret_type=get_type(root, returns->get_value());
 	  f.name=name->get_value();
+	  f.mangled=mangled->get_value();
 
 	  xmlpp::Node::NodeList list = node->get_children("Argument");
 	  for(xmlpp::Node::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter)
@@ -166,17 +250,24 @@ 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())));
+		    // todo: ugly - could be any other error
+		    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::string("type of parameter `")+f.args.back().first+"' not (yet?) supported");
+		    }
 	       }
 	  }
+	  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<const xmlpp::ContentNode*>(node);
 	       const xmlpp::TextNode* nodeText = dynamic_cast<const xmlpp::TextNode*>(node);
@@ -189,60 +280,8 @@ protected:
 
 	       if(!nodeText && !nodeComment && !nodename.empty()) //Let's not say "name: text".
 	       {
-		    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 (node->get_name() == "Function") parse_function(root, node);
 	       }
-	       else if(nodeText) //Let's say when it's text. - e.g. let's say what that white space is.
-	       {
-		    print_indentation(indentation);
-		    std::cout << "Text Node" << std::endl;
-	       }
-
-	       //Treat the various node types differently: 
-	       if(nodeText)
-	       {
-		    print_indentation(indentation);
-		    std::cout << "text = \"" << nodeText->get_content() << "\"" << std::endl;
-	       }
-	       else if(nodeComment)
-	       {
-		    print_indentation(indentation);
-		    std::cout << "comment = " << nodeComment->get_content() << std::endl;
-	       }
-	       else if(nodeContent)
-	       {
-		    print_indentation(indentation);
-		    std::cout << "content = " << nodeContent->get_content() << std::endl;
-	       }
-	       else if(const xmlpp::Element* nodeElement = dynamic_cast<const xmlpp::Element*>(node))
-	       {
-		    //A normal Element node:
-
-		    //line() works only for ElementNodes.
-		    print_indentation(indentation);
-		    std::cout << "     line = " << node->get_line() << std::endl;
-
-		    //Print attributes:
-		    const xmlpp::Element::AttributeList& attributes = nodeElement->get_attributes();
-		    for(xmlpp::Element::AttributeList::const_iterator iter = attributes.begin(); iter != attributes.end(); ++iter)
-		    {
-			 const xmlpp::Attribute* attribute = *iter;
-			 print_indentation(indentation);
-			 std::cout << "  Attribute " << attribute->get_name() << " = " << attribute->get_value() << std::endl;
-		    }
-
-		    const xmlpp::Attribute* attribute = nodeElement->get_attribute("title");
-		    if(attribute)
-		    {
-			 std::cout << "title found: =" << attribute->get_value() << std::endl;
-      
-		    }
-	       }
-  
 	       if(!nodeContent)
 	       {
 		    //Recurse through child nodes:
@@ -269,14 +308,13 @@ used_groups(const std::list<t2n_procedure> &funcs) {
 void output_common_hpp(std::ostream &o, const std::list<t2n_procedure> &procs) {
      std::set<std::string> groups(used_groups(procs));
 
-     o << "#include \"codegen-stubhead.hxx\"\n";
      for (std::set<std::string>::iterator it=groups.begin();it!=groups.end();++it) {
 	  o << "class cmd_group_" << *it << " : public libt2n::command\n"
 	    << "{\n"
 	    << "private:\n"
 	    << "	friend class boost::serialization::access;\n"
 	    << "	template<class Archive>\n"
-	    << "	void serialize(Archive & ar, const unsigned int version)\n"
+	    << "	void serialize(Archive & ar, const unsigned int /* version */)\n"
 	    << "	{ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::command);}\n"
 	    << "};\n";
      }
@@ -288,12 +326,13 @@ void output_common_hpp(std::ostream &o, const std::list<t2n_procedure> &procs) {
 	    << "	" << it->ret_type << " res;\n"
 	    << "	friend class boost::serialization::access;\n"
 	    << "	template<class Archive>\n"
-	    << "	void serialize(Archive & ar, const unsigned int version)\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"
 	    << "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,11 +342,11 @@ 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"
-	    << "	void serialize(Archive & ar, const unsigned int version)\n"
+	    << "	void serialize(Archive & ar, const unsigned int /* version */)\n"
 	    << "	{\n"
 	    << "		ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(cmd_group_" << it->group << ");\n";
 	  for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
@@ -341,7 +380,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) {
@@ -412,6 +451,14 @@ void output_client_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, c
      o << "#include \"" << common_cpp << "\"\n";
 }
 
+void output_server_hpp(std::ostream &o, const std::list<t2n_procedure> &procs, const std::string &common_hpp) {
+     o << "#include \"" << common_hpp << "\"\n";
+
+     // output function declarations
+     for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it)
+       o << *it << ";\n";
+}
+
 void output_server_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, const std::string &common_hpp, const std::string &common_cpp) {
      o << "#include \"" << common_hpp << "\"\n";
 
@@ -427,19 +474,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) {
@@ -465,44 +499,68 @@ struct cpp_file : public std::ofstream
 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";
-  
-     Parser parser(filepath);
-     std::list<t2n_procedure> procedures(parser.get_procedures());
-
-     std::cerr << "Procedures:" << std::endl;
-     for (std::list<t2n_procedure>::const_iterator it=procedures.begin();it!=procedures.end();++it)
-	  std::cerr << *it << ";" << std::endl;
-
-     std::set<std::string> groups(used_groups(procedures));
-     std::cerr << "Used groups:" << std::endl;
-     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");
-
-     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");
-
-     header_file client_hpp(client_hpp_fname.c_str());
-     output_client_hpp(client_hpp, procedures);
-
-     cpp_file client_cpp(client_cpp_fname.c_str());
-     output_client_cpp(client_cpp, procedures, common_hpp_fname, common_cpp_fname, client_hpp_fname);
-
-     cpp_file server_cpp(server_cpp_fname.c_str());
-     output_server_cpp(server_cpp, procedures, common_hpp_fname, common_cpp_fname);
-     return 0;
+     if (argc < 3) {
+	  std::cerr << "Usage: " << argv[0] << "default-group gccxml-file1 gccxml-file2 ... " << std::endl;
+	  return 1;
+     }
+
+     try{
+	  std::string group(argv[1]);
+	  std::list<std::string> xmlfiles;
+	  for (int i=2;i<argc;++i)
+	    xmlfiles.push_back(argv[i]);
+
+	  std::string prefix=group+"_";
+	  std::list<t2n_procedure> procedures;
+	  for (std::list<std::string>::iterator it=xmlfiles.begin();it!=xmlfiles.end();++it) {
+	    Parser parser(*it, group);
+	    const std::list<t2n_procedure> &p(parser.get_procedures());
+	    std::copy(p.begin(), p.end(), std::back_inserter(procedures));
+	  }
+
+	  std::cerr << "Procedures:" << std::endl;
+	  for (std::list<t2n_procedure>::const_iterator it=procedures.begin();it!=procedures.end();++it)
+	       std::cerr << *it << ";" << std::endl;
+
+	  std::set<std::string> groups(used_groups(procedures));
+	  std::cerr << "Used groups:" << std::endl;
+	  for (std::set<std::string>::const_iterator it=groups.begin();it!=groups.end();++it)
+	       std::cerr << *it << std::endl;
+
+	  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_hpp_fname(prefix+"server.hxx");
+	  std::string server_cpp_fname(prefix+"server.cpp");
+
+	  header_file common_hpp(common_hpp_fname.c_str());
+	  common_hpp << "// boost serialization is picky about order of include files => we have to include this one first\n"
+		     << "#include \"codegen-stubhead.hxx\"\n"
+		     << "#include \"" << group << ".hxx\"\n";
+
+	  output_common_hpp(common_hpp, procedures);
+
+	  cpp_file common_cpp(common_cpp_fname.c_str());
+	  output_common_cpp(common_cpp, procedures, common_hpp_fname);
+
+	  header_file client_hpp(client_hpp_fname.c_str());
+	  client_hpp << "// boost serialization is picky about order of include files => we have to include this one first\n"
+		     << "#include \"codegen-stubhead.hxx\"\n"
+		     << "#include \"" << group << ".hxx\"\n";
+	  output_client_hpp(client_hpp, procedures);
+
+	  cpp_file client_cpp(client_cpp_fname.c_str());
+	  output_client_cpp(client_cpp, procedures, common_hpp_fname, common_cpp_fname, client_hpp_fname);
+
+	  header_file server_hpp(server_hpp_fname.c_str());
+	  output_server_hpp(server_hpp, procedures, common_hpp_fname);
+
+	  cpp_file server_cpp(server_cpp_fname.c_str());
+	  output_server_cpp(server_cpp, procedures, common_hpp_fname, common_cpp_fname);
+     }catch(const parse_error &e){
+       std::cerr << e.what() << std::endl;
+       return EXIT_FAILURE;
+     }
+     return EXIT_SUCCESS;
 }