X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=fb57155a516537067cdbdda0e909cd25f3b8f83b;hp=f0c6ad4063af8b699560047b058f6db5bfb3a9b9;hb=b522255ce25f1fc10826b08ffa0228836d79ca0b;hpb=fb5c13c6a58254295bc0b6f18e618f18b4c318e5

diff --git a/codegen/main.cpp b/codegen/main.cpp
index f0c6ad4..fb57155 100644
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -4,6 +4,11 @@
 #include <set>
 #include <fstream>
 #include <list>
+#include <stdexcept>
+#include <boost/lexical_cast.hpp>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 //! convert string to upper case
 std::string
@@ -31,21 +36,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
@@ -69,6 +59,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,26 +80,19 @@ 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) {
+//! extract group from attributes
+std::string
+extract_group(const std::string &attrs)
+{
+     // todo: improve this
      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;
+     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
@@ -116,6 +108,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 +147,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"));
@@ -168,7 +170,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;
@@ -233,10 +234,7 @@ protected:
 	  // attributes are speparated by spaces?
 
 	  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 (extract_group(attributes->get_value()).empty()) return;
 
 	  // we need the return type
 	  f.ret_type=get_type(root, returns->get_value());
@@ -252,6 +250,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;
@@ -287,130 +293,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";
@@ -418,24 +397,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
@@ -444,7 +419,15 @@ void output_client_cpp(std::ostream &o, const std::list<t2n_procedure> &procs, c
      o << "#include \"" << common_cpp << "\"\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_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
+     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::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) {
@@ -464,7 +447,7 @@ struct header_file : public std::ofstream
      header_file(const char* fname) : std::ofstream(fname) {
 	  std::cerr << "create header: '" << fname << "'" << std::endl;
 	  std::string macro(replace(toupper(fname),'.','_'));
-	  *this << "// automatically generated code - do not edit\n" << std::endl;
+	  *this << "// automatically generated code (generated by libt2n-codegen " << VERSION << ") - do not edit\n" << std::endl;
 	  *this << "#ifndef " << macro << "\n"
 		<< "#define " << macro << "\n";
      }
@@ -481,93 +464,73 @@ struct cpp_file : public std::ofstream
      }
 };
 
-std::list<std::string>
-get_includes(const std::string &fname)
+int
+main(int argc, char* argv[])
 {
-     // grep "#include" fname
-     std::ifstream in(fname.c_str());
-     std::string line;
-     std::list<std::string> ret;
-     while (std::getline(in,line)) {
-	  if (line.find("#include")!=std::string::npos)
-	       ret.push_back(line);
-     }
-     return ret;
-}
+    // todo: maybe use getopt
+    if ((argc>1)&&(std::string(argv[1])=="--version")) {
+	std::cerr << VERSION << std::endl;
+	return 0;
+    }
+    if (argc < 3)
+    {
+	std::cerr << "Usage: " << argv[0] << "default-group gccxml-file1 gccxml-file2 ... " << std::endl;
+	return 1;
+    }
+
+    try{
+	  std::string group(argv[1]);
+	  std::list<std::string> xmlfiles;
+	  for (int i=2;i<argc;++i)
+	    xmlfiles.push_back(argv[i]);
+
+	  std::string prefix=group+"_";
+	  std::list<t2n_procedure> procedures;
+	  for (std::list<std::string>::iterator it=xmlfiles.begin();it!=xmlfiles.end();++it) {
+	      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));
+	  }
 
-void
-paste_includes(std::ostream &o, std::list<std::string> &i)
-{
-     o << std::endl
-       << "// copied includes begin" << std::endl;
-     for (std::list<std::string>::const_iterator it=i.begin(); it!=i.end(); ++it)
-	  o << *it << std::endl;
-     o << "// copied includes end" << std::endl
-       << std::endl;
-}
+	  std::cerr << "Procedures:" << std::endl;
+	  for (std::list<t2n_procedure>::const_iterator it=procedures.begin();it!=procedures.end();++it)
+	       std::cerr << *it << ";" << std::endl;
 
-struct RemoveGenerated
-{
-     RemoveGenerated(const std::string &_prefix) : prefix(_prefix) {}
-     bool operator()(const std::string &s) const {
-	  return (s.find(prefix+"common.hxx")!=std::string::npos);
-     }
-     const std::string &prefix;
-};
+	  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");
 
-int
-main(int argc, char* argv[])
-{
-     if (argc != 4) {
-	  std::cerr << "Usage: " << argv[0] << " header-file gccxml-file outputprefix" << std::endl;
-	  return 1;
+	  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"
+		     << "#include \"" << group << ".hxx\"\n";
+
+	  output_common_hpp(common_hpp, group, procedures);
+
+	  cpp_file common_cpp(common_cpp_fname.c_str());
+	  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, group, procedures);
+
+	  cpp_file client_cpp(client_cpp_fname.c_str());
+	  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, group, procedures, common_hpp_fname);
+
+	  cpp_file server_cpp(server_cpp_fname.c_str());
+	  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;
      }
-     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;
-
-     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;
+     return EXIT_SUCCESS;
 }