cleanup - removed LIBT2N_SET_DEFAULTGROUP(x)
[libt2n] / codegen / main.cpp
index f0c6ad4..e3ce124 100644 (file)
@@ -4,6 +4,8 @@
 #include <set>
 #include <fstream>
 #include <list>
+#include <stdexcept>
+#include <boost/lexical_cast.hpp>
 
 //! convert string to upper case
 std::string
@@ -69,6 +71,15 @@ const xmlpp::Element* get_element_by_id(const xmlpp::Element* element, const std
      return NULL;
 }
 
+std::string
+get_file(const xmlpp::Element* root, const std::string &file_id)
+{
+     std::string error;
+     const xmlpp::Element* e=get_element_by_id(root, file_id);
+     if ((!e)||(!e->get_attribute("name"))) return error;
+     return e->get_attribute("name")->get_value();
+}
+
 //! get namespace by id
 /*!
   \return namespace name or empty string on error
@@ -81,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;
@@ -116,6 +105,13 @@ std::ostream &operator<<(std::ostream &o, const type_info &t) {
      return o;
 }
 
+struct parse_error : public std::runtime_error
+{
+     parse_error(const std::string &file, unsigned line, const std::string &msg)
+         : std::runtime_error(file+":"+boost::lexical_cast<std::string>(line)+": error: "+msg)
+         {}
+};
+
 //! get type by id
 /*!
   \return type name or empty string on error
@@ -148,6 +144,9 @@ type_info get_type(const xmlpp::Element* root, const std::string &id)
          if (ret==error) return error;
          ret.name=std::string("const ")+ret.name;
          return ret;
+     }else if (tag=="PointerType") {
+         // not yet supported
+         return error;
      }
 
      assert(element->get_attribute("name"));
@@ -198,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;
@@ -217,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) {
@@ -235,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());
@@ -252,6 +251,14 @@ protected:
                    assert(arg->get_attribute("name"));
                    assert(arg->get_attribute("type"));
                    f.args.push_back(std::pair<std::string, type_info>(arg->get_attribute("name")->get_value(), get_type(root, arg->get_attribute("type")->get_value())));
+                   // todo: ugly - could be any other error
+                   if (f.args.back().second.name.empty()) {
+                        assert(element->get_attribute("file"));
+                        assert(element->get_attribute("line"));
+                        throw parse_error(get_file(root, element->get_attribute("file")->get_value()),
+                                          boost::lexical_cast<unsigned>(element->get_attribute("line")->get_value())-1,
+                                          std::string("type of parameter `")+f.args.back().first+"' not (yet?) supported");
+                   }
               }
          }
          std::cerr << "Found function: " << f << std::endl;
@@ -444,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";
 
@@ -519,55 +534,67 @@ 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] << " export-file gccxml-file default-group" << std::endl;
          return 1;
      }
-     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::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;
+     try{
+         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(exportfile));
+         remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix));
+         includes.erase(remove_if(includes.begin(), includes.end(), RemoveGenerated(prefix)), includes.end());
 
-     std::string common_hpp_fname(prefix+"common.hxx");
-     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_cpp_fname(prefix+"server.cpp");
-
-     header_file common_hpp(common_hpp_fname.c_str());
-     common_hpp << "#include \"codegen-stubhead.hxx\"\n";
-     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);
-
-     header_file client_hpp(client_hpp_fname.c_str());
-     client_hpp << "#include \"codegen-stubhead.hxx\"\n";
-     // we can't paste the includes before codegen-stubhead.hxx was included
-     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 server_cpp(server_cpp_fname.c_str());
-     output_server_cpp(server_cpp, procedures, common_hpp_fname, common_cpp_fname);
-     return 0;
+         //paste_includes(std::cerr, includes);
+  
+         Parser parser(xmlfile, group);
+         std::list<t2n_procedure> procedures(parser.get_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");
+         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);
+              
+         output_common_hpp(common_hpp, procedures);
+
+         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);
+
+         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){
+       std::cerr << e.what() << std::endl;
+       return EXIT_FAILURE;
+     }
+     return EXIT_SUCCESS;
 }