start of nicer error handling

diff --git a/codegen/main.cpp b/codegen/main.cpp
index f0c6ad4..a8580ba 100644 (file)
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -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
@@ -116,6 +127,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 +166,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"));
@@ -252,6 +273,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;
@@ -522,52 +551,59 @@ main(int argc, char* argv[])
          std::cerr << "Usage: " << argv[0] << " header-file gccxml-file outputprefix" << 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;
+     try{
+         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());
 
-     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_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);
+         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_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);
+
+              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;
 }