(no commit message)

[libt2n] / codegen / main.cpp

diff --git a/codegen/main.cpp b/codegen/main.cpp
index a8580ba..517d14f 100644 (file)
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -219,7 +219,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 &group) : m_fname(fname), m_group(group) {}
 
      std::list<t2n_procedure> get_procedures() {
          xmlpp::DomParser parser;
@@ -238,6 +238,7 @@ public:
      }
 protected:
      std::string m_fname;
+     std::string m_group;
      std::list<t2n_procedure> m_procedures;
 
      void parse_function(const xmlpp::Element* root, const xmlpp::Node* node) {
@@ -257,7 +258,7 @@ protected:
          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_group;
 
          // we need the return type
          f.ret_type=get_type(root, returns->get_value());
@@ -473,6 +474,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";
 
@@ -548,21 +557,22 @@ int
 main(int argc, char* argv[])
 {
      if (argc != 4) {
-         std::cerr << "Usage: " << argv[0] << " header-file gccxml-file outputprefix" << std::endl;
+         std::cerr << "Usage: " << argv[0] << " header-file gccxml-file group" << std::endl;
          return 1;
      }
 
      try{
          std::string headerfile(argv[1]);
          std::string xmlfile(argv[2]);
-         std::string prefix(argv[3]);
+         std::string group(argv[3]);
+         std::string prefix=group+"_";
          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);
+         Parser parser(xmlfile, group);
          std::list<t2n_procedure> procedures(parser.get_procedures());
 
          std::cerr << "Procedures:" << std::endl;
@@ -578,6 +588,7 @@ 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());
@@ -599,6 +610,9 @@ main(int argc, char* argv[])
               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){