X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=fe400b2f0c7537fdae6466da3a8fffb2f9953d7b;hp=50026de4df739f01293ea03eea9bb10fab5f0ce9;hb=3b7c93a8beb79498d2116969ff9c873fbe56d157;hpb=1ef8a13549f9999519fcfc95d09f8f9589031bfd

diff --git a/codegen/main.cpp b/codegen/main.cpp
index 50026de..fe400b2 100644
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -122,6 +122,7 @@ struct type_info
      std::string noref_name;
      bool operator==(const type_info& o) {return (name==o.name) && (noref_name == o.noref_name);}
      std::string noref() const {return noref_name.empty() ? name : noref_name;}
+     bool isVoid() const {return name=="void";}
 };
 
 std::ostream &operator<<(std::ostream &o, const type_info &t) {
@@ -209,6 +210,7 @@ struct t2n_procedure
      std::string cmd_classname() const {
 	  return name+mangled+"_cmd";
      }
+     bool hasReturn() const {return !ret_type.isVoid();}
 };
 
 std::ostream &operator<<(std::ostream &o, const t2n_procedure::Args &args) {
@@ -224,6 +226,20 @@ std::ostream &operator<<(std::ostream &o, const t2n_procedure &f) {
      return o;
 }
 
+std::pair<std::string, unsigned>
+get_file_and_line(const xmlpp::Element* root, const xmlpp::Element* element)
+{
+  return std::pair<std::string, unsigned>(get_file(root, element->get_attribute("file")->get_value()),
+					  boost::lexical_cast<unsigned>(element->get_attribute("line")->get_value())-1);
+}
+
+std::string
+get_file_and_line_as_string(const xmlpp::Element* root, const xmlpp::Element* element)
+{
+  std::pair<std::string, unsigned> fl(get_file_and_line(root,element));
+  return std::string(fl.first)+":"+boost::lexical_cast<std::string>(fl.second);
+}
+
 class Parser
 {
 public:
@@ -282,13 +298,14 @@ protected:
 		    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::pair<std::string, unsigned> file_and_line(get_file_and_line(root, element));
+			 throw parse_error(file_and_line.first,
+					   file_and_line.second,
 					   std::string("type of parameter `")+f.args.back().first+"' not (yet?) supported");
 		    }
 	       }
 	  }
-	  std::cerr << "Found function: " << f << std::endl;
+	  std::cerr << get_file_and_line_as_string(root, element) << ": found procedure: " << f << std::endl;
 	  m_procedures.push_back(f);
      }
 
@@ -335,19 +352,19 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis
 	o << "class " << it->ret_classname() << " : public libt2n::result\n"
 	  << "{\n"
 	  << "private:\n";
-	if (it->ret_type.name!="void")
+	if (it->hasReturn())
 	  o << "	" << it->ret_type << " res;\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(libt2n::result);\n";
-	if (it->ret_type.name!="void")
+	if (it->hasReturn())
 	  o << "		ar & BOOST_SERIALIZATION_NVP(res);\n";
 	o << "	}\n"
 	  << "public:\n"
 	  << "	" << it->ret_classname() << "() {}\n";
-	if (it->ret_type.name!="void") {
+	if (it->hasReturn()) {
 	  o << "	" << it->ret_classname() << "(const " << it->ret_type << " &_res) : res(_res) {}\n"
 	    << "	" << it->ret_type << " get_data() { return res; }\n";
 	}
@@ -444,7 +461,7 @@ void output_client_cpp(std::ostream &o, const std::string &group, const std::lis
 	 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";
-	 if (pit->ret_type.name!="void")
+	 if (pit->hasReturn())
 	   o << "	return res->get_data();\n";
 	 o << "}\n";
      }
@@ -469,7 +486,7 @@ void output_server_cpp(std::ostream &o, const std::string &group, const std::lis
      for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
 	  o << *it << ";\n";
 	  o << "libt2n::result* " << it->cmd_classname() << "::operator()() { ";
-	  if (it->ret_type.name!="void") {
+	  if (it->hasReturn()) {
 	    o << "return new " << it->ret_classname() << "(" << it->name << "(";
 	    for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
 	      if (ait!=it->args.begin()) o << ", ";