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

diff --git a/codegen/main.cpp b/codegen/main.cpp
index a8580ba..85c56eb 100644
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -92,28 +92,6 @@ std::string get_namespace(const xmlpp::Element* root, const std::string &id)
      return element->get_attribute("name")->get_value();
 }
 
-//! get default group
-std::string get_default_group(const xmlpp::Element* root) {
-     std::string error;
-
-     if (   (root->get_attribute("name"))
-	 && (root->get_attribute("attributes"))
-	 && (root->get_name() == "Typedef")
-	 && (root->get_attribute("name")->get_value()=="libt2n_default_group"))
-	  return extract_group(root->get_attribute("attributes")->get_value());
-
-     //Recurse through child nodes:
-     xmlpp::Node::NodeList list = root->get_children();
-     for(xmlpp::Node::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter)
-     {
-	  if (const xmlpp::Element* elem=dynamic_cast<const xmlpp::Element*>(*iter)) {
-	       std::string ret(get_default_group(elem));
-	       if (!ret.empty()) return ret;
-	  }
-     }
-     return error;
-}
-
 struct type_info
 {
      std::string name;
@@ -219,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;
@@ -238,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) {
@@ -256,8 +235,7 @@ protected:
 	  t2n_procedure f;
 	  f.group=extract_group(attributes->get_value());
 	  if (f.group.empty()) return;
-	  // todo: handle default group
-	  if (f.group=="default") f.group=get_default_group(root);
+	  if (f.group=="default") f.group=m_default_group;
 
 	  // we need the return type
 	  f.ret_type=get_type(root, returns->get_value());
@@ -473,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";
 
@@ -510,60 +496,27 @@ struct cpp_file : public std::ofstream
      }
 };
 
-std::list<std::string>
-get_includes(const std::string &fname)
-{
-     // grep "#include" fname
-     std::ifstream in(fname.c_str());
-     std::string line;
-     std::list<std::string> ret;
-     while (std::getline(in,line)) {
-	  if (line.find("#include")!=std::string::npos)
-	       ret.push_back(line);
-     }
-     return ret;
-}
-
-void
-paste_includes(std::ostream &o, std::list<std::string> &i)
-{
-     o << std::endl
-       << "// copied includes begin" << std::endl;
-     for (std::list<std::string>::const_iterator it=i.begin(); it!=i.end(); ++it)
-	  o << *it << std::endl;
-     o << "// copied includes end" << std::endl
-       << std::endl;
-}
-
-struct RemoveGenerated
-{
-     RemoveGenerated(const std::string &_prefix) : prefix(_prefix) {}
-     bool operator()(const std::string &s) const {
-	  return (s.find(prefix+"common.hxx")!=std::string::npos);
-     }
-     const std::string &prefix;
-};
-
 int
 main(int argc, char* argv[])
 {
-     if (argc != 4) {
-	  std::cerr << "Usage: " << argv[0] << " header-file gccxml-file outputprefix" << std::endl;
+     if (argc < 3) {
+	  std::cerr << "Usage: " << argv[0] << "default-group gccxml-file1 gccxml-file2 ... " << std::endl;
 	  return 1;
      }
 
      try{
-	  std::string headerfile(argv[1]);
-	  std::string xmlfile(argv[2]);
-	  std::string prefix(argv[3]);
-	  std::list<std::string> includes(get_includes(headerfile));
-	  remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix));
-	  includes.erase(remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix)), includes.end());
-
-	  //paste_includes(std::cerr, includes);
-  
-	  Parser parser(xmlfile);
-	  std::list<t2n_procedure> procedures(parser.get_procedures());
+	  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)
@@ -578,32 +531,36 @@ 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_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";
-	       paste_includes(common_hpp, includes);
+		     << "#include \"codegen-stubhead.hxx\"\n"
+		     << "#include \"" << group << ".hxx\"\n";
+
+	  output_common_hpp(common_hpp, procedures);
 
-	       output_common_hpp(common_hpp, procedures);
+	  cpp_file common_cpp(common_cpp_fname.c_str());
+	  output_common_cpp(common_cpp, procedures, common_hpp_fname);
 
-	       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);
 
-	       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";
-	       paste_includes(client_hpp, includes);
-	       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 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);
+	  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;
+       std::cerr << e.what() << std::endl;
+       return EXIT_FAILURE;
      }
      return EXIT_SUCCESS;
 }