cleanup - simpliefied again by removing support for multiple command groups within...
[libt2n] / codegen / main.cpp
index 85c56eb..ec97403 100644 (file)
@@ -33,21 +33,6 @@ strip(std::string s, std::string prefix)
      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
 /*!
   \return pointer to element having id or null on error
@@ -92,6 +77,21 @@ std::string get_namespace(const xmlpp::Element* root, const std::string &id)
      return element->get_attribute("name")->get_value();
 }
 
+//! 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);
+}
+
 struct type_info
 {
      std::string name;
@@ -167,7 +167,6 @@ struct t2n_procedure
 {
      typedef std::list<std::pair<std::string, type_info> > Args;
 
-     std::string group;
      type_info ret_type;
      std::string name;
      std::string mangled;
@@ -197,7 +196,7 @@ std::ostream &operator<<(std::ostream &o, const t2n_procedure &f) {
 class Parser
 {
 public:
-     Parser(const std::string &fname, const std::string &default_group) : m_fname(fname), m_default_group(default_group) {}
+     Parser(const std::string &fname) : m_fname(fname) {}
 
      std::list<t2n_procedure> get_procedures() {
          xmlpp::DomParser parser;
@@ -216,7 +215,6 @@ 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) {
@@ -233,9 +231,7 @@ protected:
          // attributes are speparated by spaces?
 
          t2n_procedure f;
-         f.group=extract_group(attributes->get_value());
-         if (f.group.empty()) return;
-         if (f.group=="default") f.group=m_default_group;
+         if (extract_group(attributes->get_value()).empty()) return;
 
          // we need the return type
          f.ret_type=get_type(root, returns->get_value());
@@ -294,130 +290,103 @@ protected:
          }
 };
 
-//! find used groups
-std::set<std::string>
-used_groups(const std::list<t2n_procedure> &funcs) {
-     typedef std::set<std::string> Groups;
-     Groups groups;
-     for (std::list<t2n_procedure>::const_iterator it=funcs.begin();it!=funcs.end();++it)
-         // since we use std::set each group is inserted only once
-         groups.insert(it->group);
-     return groups;
-}
-
-void output_common_hpp(std::ostream &o, const std::list<t2n_procedure> &procs) {
-     std::set<std::string> groups(used_groups(procs));
-
-     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"
-           << "        {ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::command);}\n"
-           << "};\n";
-     }
+void output_common_hpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs) {
+    o << "class cmd_group_" << group << " : 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"
+      << "     {ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::command);}\n"
+      << "};\n";
      
-     for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
-         o << "class " << it->ret_classname() << " : public libt2n::result\n"
-           << "{\n"
-           << "private:\n"
-           << "        " << it->ret_type << " res;\n"
-           << "        friend class boost::serialization::access;\n"
-           << "        template<class Archive>\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";
-     }
-     for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
-         o << "class " << it->cmd_classname() << " : public " << "cmd_group_" << it->group << "\n"
-           << "{\n"
-           << "private:\n";
-         for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
-              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"
-           << "        {\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) {
-              o << "           ar & BOOST_SERIALIZATION_NVP(" << ait->first << ");\n";
-         }
-
-         // default constructor
-         o << "        }\n"
-           << "\n"
-           << "public:\n"
-           << "        " << it->cmd_classname() << "() {}\n";
-
-         // constructor taking all arguments
-         o << "        " << it->cmd_classname() << "(";
-         for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
-              if (ait!=it->args.begin()) o << ", ";
-              o << ait->second << " _" << ait->first;
-         }
-         o << ") : ";
-         for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
-              if (ait!=it->args.begin()) o << ", ";
-              o << ait->first << "(_" << ait->first << ")";
-         }
-         o << " {}\n"
-           << "        libt2n::result* operator()();\n"
-           << "};\n";
-     }
+    for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
+       o << "class " << it->ret_classname() << " : public libt2n::result\n"
+         << "{\n"
+         << "private:\n"
+         << "  " << it->ret_type << " res;\n"
+         << "  friend class boost::serialization::access;\n"
+         << "  template<class Archive>\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";
+    }
+    for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
+       o << "class " << it->cmd_classname() << " : public " << "cmd_group_" << group << "\n"
+         << "{\n"
+         << "private:\n";
+       for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+           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"
+         << "  {\n"
+         << "          ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(cmd_group_" << group << ");\n";
+       for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+           o << "              ar & BOOST_SERIALIZATION_NVP(" << ait->first << ");\n";
+       }
+       
+       // default constructor
+       o << "  }\n"
+         << "\n"
+         << "public:\n"
+         << "  " << it->cmd_classname() << "() {}\n";
+       
+       // constructor taking all arguments
+       o << "  " << it->cmd_classname() << "(";
+       for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+           if (ait!=it->args.begin()) o << ", ";
+           o << ait->second << " _" << ait->first;
+       }
+       o << ") : ";
+       for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+           if (ait!=it->args.begin()) o << ", ";
+           o << ait->first << "(_" << ait->first << ")";
+       }
+       o << " {}\n"
+         << "  libt2n::result* operator()();\n"
+         << "};\n";
+    }
 }
 
-void output_common_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, const std::string &common_hpp) {
-     std::set<std::string> groups(used_groups(procs));
-
+void output_common_cpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs, const std::string &common_hpp) {
      o << "#include \"" << common_hpp << "\"\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) {
-         o << "BOOST_CLASS_EXPORT(cmd_group_" << *it << ")\n";
-     }
+     o << "BOOST_CLASS_EXPORT(cmd_group_" << group << ")\n";
      for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
          o << "BOOST_CLASS_EXPORT("<<it->ret_classname()<<")\n"
            << "BOOST_CLASS_EXPORT("<<it->cmd_classname()<<")\n";
      }
 }
 
-void output_client_hpp(std::ostream &o, const std::list<t2n_procedure> &procs) {
-     std::set<std::string> groups(used_groups(procs));
-
+void output_client_hpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs) {
      o << "#include <command_client.hxx>\n";
 
-     for (std::set<std::string>::iterator it=groups.begin();it!=groups.end();++it) {
-         o << "class cmd_group_" << *it << "_client : public libt2n::command_client\n"
-           << "{\n"
-           << "public:\n"
-           << "cmd_group_" << *it << "_client(libt2n::client_connection &_c,\n"
-           << "        long long _command_timeout_usec=command_timeout_usec_default,\n"
-           << "        long long _hello_timeout_usec=hello_timeout_usec_default)\n"
-           << "        : libt2n::command_client(_c,_command_timeout_usec,_hello_timeout_usec)\n"
-            << "       {}\n";
-         for (std::list<t2n_procedure>::const_iterator pit=procs.begin();pit!=procs.end();++pit) {
-              if (pit->group==*it) {
-                   o << "      " << *pit << ";\n";
-              }
-         }
-         o << "};\n";
+     o << "class cmd_group_" << group << "_client : public libt2n::command_client\n"
+       << "{\n"
+       << "public:\n"
+       << "cmd_group_" << group << "_client(libt2n::client_connection &_c,\n"
+       << "    long long _command_timeout_usec=command_timeout_usec_default,\n"
+       << "    long long _hello_timeout_usec=hello_timeout_usec_default)\n"
+       << "    : libt2n::command_client(_c,_command_timeout_usec,_hello_timeout_usec)\n"
+       << "    {}\n";
+     for (std::list<t2n_procedure>::const_iterator pit=procs.begin();pit!=procs.end();++pit) {
+        o << " " << *pit << ";\n";
      }
+     o << "};\n";
 }
 
-void output_client_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, const std::string &common_hpp, const std::string &common_cpp, const std::string &client_hpp) {
-     std::set<std::string> groups(used_groups(procs));
-
+void output_client_cpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs, const std::string &common_hpp, const std::string &common_cpp, const std::string &client_hpp) {
      o << "#include \"" << client_hpp << "\"\n"
        << "#include \"" << common_hpp << "\"\n"
        << "// fake\n";
@@ -425,24 +394,20 @@ void output_client_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, c
          o << "libt2n::result* " << it->cmd_classname() << "::operator()() { return NULL; }\n";
      }
 
-     for (std::set<std::string>::iterator it=groups.begin();it!=groups.end();++it) {
-         for (std::list<t2n_procedure>::const_iterator pit=procs.begin();pit!=procs.end();++pit) {
-              if (pit->group==*it) {
-                   o << pit->ret_type << " cmd_group_" << *it << "_client::" << pit->name << "(" << pit->args << ")\n"
-                     << "{\n"
-                     << "      libt2n::result_container rc;\n"
-                     << "      send_command(new " << pit->cmd_classname() << "(";
-                   for (t2n_procedure::Args::const_iterator ait=pit->args.begin();ait!=pit->args.end();++ait) {
-                        if (ait!=pit->args.begin()) o << ", ";
-                        o << ait->first;
-                   }
-                   o << "), rc);\n"
-                     << "      " << pit->ret_classname() << "* res=dynamic_cast<" << pit->ret_classname() << "*>(rc.get_result());\n"
-                     << "      if (!res) throw libt2n::t2n_communication_error(\"result object of wrong type\");\n"
-                     << "      return res->get_data();\n"
-                     << "}\n";
-              }
-         }
+     for (std::list<t2n_procedure>::const_iterator pit=procs.begin();pit!=procs.end();++pit) {
+        o << pit->ret_type << " cmd_group_" << group << "_client::" << pit->name << "(" << pit->args << ")\n"
+          << "{\n"
+          << " libt2n::result_container rc;\n"
+          << " send_command(new " << pit->cmd_classname() << "(";
+        for (t2n_procedure::Args::const_iterator ait=pit->args.begin();ait!=pit->args.end();++ait) {
+            if (ait!=pit->args.begin()) o << ", ";
+            o << ait->first;
+        }
+        o << "), rc);\n"
+          << " " << pit->ret_classname() << "* res=dynamic_cast<" << pit->ret_classname() << "*>(rc.get_result());\n"
+          << " if (!res) throw libt2n::t2n_communication_error(\"result object of wrong type\");\n"
+          << " return res->get_data();\n"
+          << "}\n";
      }
 
      // include in this compilation unit to ensure the compilation unit is used
@@ -451,7 +416,7 @@ 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) {
+void output_server_hpp(std::ostream &o, const std::string & /* group */, const std::list<t2n_procedure> &procs, const std::string &common_hpp) {
      o << "#include \"" << common_hpp << "\"\n";
 
      // output function declarations
@@ -459,7 +424,7 @@ void output_server_hpp(std::ostream &o, const std::list<t2n_procedure> &procs, c
        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) {
+void output_server_cpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs, const std::string &common_hpp, const std::string &common_cpp) {
      o << "#include \"" << common_hpp << "\"\n";
 
      for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
@@ -513,20 +478,16 @@ main(int argc, char* argv[])
          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 << "Parse " << *it << std::endl;
+             Parser parser(*it);
+             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");
@@ -539,25 +500,25 @@ main(int argc, char* argv[])
                     << "#include \"codegen-stubhead.hxx\"\n"
                     << "#include \"" << group << ".hxx\"\n";
 
-         output_common_hpp(common_hpp, procedures);
+         output_common_hpp(common_hpp, group, procedures);
 
          cpp_file common_cpp(common_cpp_fname.c_str());
-         output_common_cpp(common_cpp, procedures, common_hpp_fname);
+         output_common_cpp(common_cpp, group, 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);
+         output_client_hpp(client_hpp, group, 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);
+         output_client_cpp(client_cpp, group, 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);
+         output_server_hpp(server_hpp, group, 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);
+         output_server_cpp(server_cpp, group, procedures, common_hpp_fname, common_cpp_fname);
      }catch(const parse_error &e){
        std::cerr << e.what() << std::endl;
        return EXIT_FAILURE;