cleanup

[libt2n] / codegen / main.cpp

diff --git a/codegen/main.cpp b/codegen/main.cpp
index fb57155..bfe12e0 100644 (file)
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2006                                                    
+    intra2net.com                                                         
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
 #include <libxml++/libxml++.h>
 #include <cassert>
 #include <iostream>
@@ -10,6 +29,13 @@
 #include "config.h"
 #endif
 
+
+//! map group to class name
+std::string
+groupClass(const std::string &group) {
+    return std::string("cmd_group_")+group;
+}
+
 //! convert string to upper case
 std::string
 toupper(std::string s) {
@@ -80,19 +106,14 @@ 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)
+//! procedure marked for export?
+bool
+is_marked(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);
+     return (p!=std::string::npos);
 }
 
 struct type_info
@@ -234,7 +255,7 @@ protected:
          // attributes are speparated by spaces?
 
          t2n_procedure f;
-         if (extract_group(attributes->get_value()).empty()) return;
+         if (!is_marked(attributes->get_value())) return;
 
          // we need the return type
          f.ret_type=get_type(root, returns->get_value());
@@ -294,7 +315,7 @@ protected:
 };
 
 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"
+    o << "class " << groupClass(group) << " : public libt2n::command\n"
       << "{\n"
       << "private:\n"
       << "     friend class boost::serialization::access;\n"
@@ -322,7 +343,7 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis
          << "};\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"
+       o << "class " << it->cmd_classname() << " : public " << groupClass(group) << "\n"
          << "{\n"
          << "private:\n";
        for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
@@ -332,7 +353,7 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis
          << "  template<class Archive>\n"
          << "  void serialize(Archive & ar, const unsigned int /* version */)\n"
          << "  {\n"
-         << "          ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(cmd_group_" << group << ");\n";
+         << "          ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(" << groupClass(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";
        }
@@ -365,7 +386,7 @@ void output_common_cpp(std::ostream &o, const std::string &group, const std::lis
        << "#include <boost/serialization/export.hpp>\n"
        << "\n"
        << "/* register types with boost serialization */\n";
-     o << "BOOST_CLASS_EXPORT(cmd_group_" << group << ")\n";
+     o << "BOOST_CLASS_EXPORT(" << groupClass(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";
@@ -375,10 +396,10 @@ void output_common_cpp(std::ostream &o, const std::string &group, const std::lis
 void output_client_hpp(std::ostream &o, const std::string &group, const std::list<t2n_procedure> &procs) {
      o << "#include <command_client.hxx>\n";
 
-     o << "class cmd_group_" << group << "_client : public libt2n::command_client\n"
+     o << "class " << groupClass(group) << "_client : public libt2n::command_client\n"
        << "{\n"
        << "public:\n"
-       << "cmd_group_" << group << "_client(libt2n::client_connection &_c,\n"
+       << groupClass(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"
@@ -398,7 +419,7 @@ void output_client_cpp(std::ostream &o, const std::string &group, const std::lis
      }
 
      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"
+        o << pit->ret_type << " " << groupClass(group) << "_client::" << pit->name << "(" << pit->args << ")\n"
           << "{\n"
           << " libt2n::result_container rc;\n"
           << " send_command(new " << pit->cmd_classname() << "(";