X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=e3ce124f59193993a086de802ab3c6ed5a8c9753;hp=517d14fbc44e6b0f0ae2a1a0481e654e62163c88;hb=25924caeef56c6e09e73216885912ac525ebec9f;hpb=7b541de981f3ff64144822af26bf95e4476f5327

diff --git a/codegen/main.cpp b/codegen/main.cpp
index 517d14f..e3ce124 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, const std::string &group) : m_fname(fname), m_group(group) {}
+     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,7 +216,7 @@ public:
      }
 protected:
      std::string m_fname;
-     std::string m_group;
+     std::string m_default_group;
      std::list<t2n_procedure> m_procedures;
 
      void parse_function(const xmlpp::Element* root, const xmlpp::Node* node) {
@@ -257,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=m_group;
+	  if (f.group=="default") f.group=m_default_group;
 
 	  // we need the return type
 	  f.ret_type=get_type(root, returns->get_value());
@@ -557,16 +534,16 @@ int
 main(int argc, char* argv[])
 {
      if (argc != 4) {
-	  std::cerr << "Usage: " << argv[0] << " header-file gccxml-file group" << std::endl;
+	  std::cerr << "Usage: " << argv[0] << " export-file gccxml-file default-group" << std::endl;
 	  return 1;
      }
 
      try{
-	  std::string headerfile(argv[1]);
+	  std::string exportfile(argv[1]);
 	  std::string xmlfile(argv[2]);
 	  std::string group(argv[3]);
 	  std::string prefix=group+"_";
-	  std::list<std::string> includes(get_includes(headerfile));
+	  std::list<std::string> includes(get_includes(exportfile));
 	  remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix));
 	  includes.erase(remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix)), includes.end());
 
@@ -594,30 +571,30 @@ main(int argc, char* argv[])
 	  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);
-
-	       output_common_hpp(common_hpp, procedures);
+	  paste_includes(common_hpp, includes);
+	       
+	  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";
-	       paste_includes(client_hpp, includes);
-	       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);
+	  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;
 }