From 1ef8a13549f9999519fcfc95d09f8f9589031bfd Mon Sep 17 00:00:00 2001
From: Jens Thiele <jens.thiele@intra2net.com>
Date: Mon, 18 Dec 2006 17:40:58 +0000
Subject: [PATCH] added support for void return and no args

---
 codegen/main.cpp |   69 ++++++++++++++++++++++++++++++++----------------------
 1 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/codegen/main.cpp b/codegen/main.cpp
index b1a0ce1..50026de 100644
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -334,20 +334,24 @@ void output_common_hpp(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 << "class " << it->ret_classname() << " : public libt2n::result\n"
 	  << "{\n"
-	  << "private:\n"
-	  << "	" << it->ret_type << " res;\n"
-	  << "	friend class boost::serialization::access;\n"
+	  << "private:\n";
+	if (it->ret_type.name!="void")
+	  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"
-	  << "		ar & BOOST_SERIALIZATION_NVP(res);\n"
-	  << "	}\n"
+	  << "		ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::result);\n";
+	if (it->ret_type.name!="void")
+	  o << "		ar & BOOST_SERIALIZATION_NVP(res);\n";
+	o << "	}\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";
+	  << "	" << it->ret_classname() << "() {}\n";
+	if (it->ret_type.name!="void") {
+	  o << "	" << it->ret_classname() << "(const " << it->ret_type << " &_res) : res(_res) {}\n"
+	    << "	" << it->ret_type << " get_data() { return res; }\n";
+	}
+	o << "};\n";
     }
     for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
 	o << "class " << it->cmd_classname() << " : public " << groupClass(group) << "\n"
@@ -372,19 +376,21 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis
 	  << "	" << 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 (!it->args.empty()) {
+	  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) {
+	  }
+	  o << ") : ";
+	  for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
 	    if (ait!=it->args.begin()) o << ", ";
 	    // pointers are const pointers and must be dereferenced
 	    o << ait->first << "(" << ((ait->second.name.find_first_of('*')!=std::string::npos) ? "*" : "" ) << "_" << ait->first << ")";
+	  }
+	  o << " {}\n";
 	}
-	o << " {}\n"
-	  << "	libt2n::result* operator()();\n"
+	o << "	libt2n::result* operator()();\n"
 	  << "};\n";
     }
 }
@@ -437,9 +443,10 @@ 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"
-	   << "	return res->get_data();\n"
-	   << "}\n";
+	   << "	if (!res) throw libt2n::t2n_communication_error(\"result object of wrong type\");\n";
+	 if (pit->ret_type.name!="void")
+	   o << "	return res->get_data();\n";
+	 o << "}\n";
      }
 
      // include in this compilation unit to ensure the compilation unit is used
@@ -461,15 +468,21 @@ 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()() { 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 << ", ";
-	       // get pointer
-	       if (ait->second.name.find_first_of('*')!=std::string::npos)
-		 o << '&';
-	       o << ait->first;
+	  o << "libt2n::result* " << it->cmd_classname() << "::operator()() { ";
+	  if (it->ret_type.name!="void") {
+	    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 << ", ";
+	      // get pointer
+	      if (ait->second.name.find_first_of('*')!=std::string::npos)
+		o << '&';
+	      o << ait->first;
+	    }
+	    o << "));";
+	  }else{
+	    o << it->name << "(); return new " << it->ret_classname() << "();";
 	  }
-	  o << ")); }\n";
+	  o << " }\n";
      }
      o << "#include \"" << common_cpp << "\"\n";
 }
-- 
1.7.1