X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=codegen%2Fmain.cpp;h=b1a0ce179a62eb470db1309a94f2be4147ee9166;hp=f61d8098eab14898d940035bcfe1651bf03ff020;hb=2fad99dbed0a4ac40a5e008e94d868810d499951;hpb=d2f31d1e1c7da2d84c5cbd2b716a4a0158db1655
diff --git a/codegen/main.cpp b/codegen/main.cpp
index f61d809..b1a0ce1 100644
--- a/codegen/main.cpp
+++ b/codegen/main.cpp
@@ -17,100 +17,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/*! \mainpage libt2n - (talk to neighbor)
- \section intro_sec Introduction
- libt2n (talk to neighbor) is a C++ library for inter-process communication (IPC, s.a. http://en.wikipedia.org/wiki/Inter-process_communication)
- with an additional code generator to make remote procedure calls simple.
- \par
- XXX: improve this paragraph: The input for the code generator is standard C++ code (in fact we use gccxml to parse the C++ code and the code generator takes the XML as input) and you mark the procedures you want to expose to other processes.
- It then generates the stubs needed.
- The exported procedures can be grouped. For each group the code generator is called and generates 6 output files: group_common.hxx, group_common.cpp, group_client.hxx, group_client.cpp, group_server.hxx, group_server.cpp. The _common files are used by client and server whereas the _client files are used by the client and the _server files by the server only.
- \par
- To simplify the build process a Makefile snippet is provided that allows to create a server program and a client library (including a corresponding .pc file) using the autotools easily.
- \section install_sec Installation
-
- \subsection requirements Requirements
- - boost (serialization )
- - gccxml
- - libxmlpp
-
- \subsection recommended Recommended
- - pkg-config
- - autotools (automake, autoconf, libtool)
-
- \subsection Compilation
- \verbatim
- ./configure && make install
- \endverbatim
-
-
- \section usage Usage example
-
- In this example we create two packages using the autotools:
- - server program and client library to connect to the server. The server exports a simple procedure using one group: "t2nexample"
- - client program using the library
-
- \subsection server Example server program and client library
-
- \par The procedure to export (input for the code generator - libt2n-codegen): t2nexample.cpp:
- \verbinclude libt2n-example1/t2nexample.cpp
-
- \par Required includes go into the group header file: t2nexample.hxx:
- libt2n uses boost for serialization. This means all types involved in a remote procedure call must be boost serializable. In this example we use std::string and boost
- already provides serialization for std::string in the boost/serialization/string.hpp header file.
- \verbinclude libt2n-example1/t2nexample.hxx
-
- \par The server program:
- \verbinclude libt2n-example1/server.cpp
-
- \par Using autoconf and automake to build a example server program and a client library.
- In the configure.in(.ac) we put a check for libt2n:
- \verbinclude libt2n-example1/configure.in
- Writing the Makefile.am isn't difficult either:
- \verbinclude libt2n-example1/Makefile.am
-
- \par Build and install the package
- \verbatim
- autoreconf -f -i && ./configure && make install
- \endverbatim
-
- \subsection client Client using the library
- Using the library is as simple as using any other library using pkg-config (the pkg-config .pc file is created automatically by the included Makefile snippet)
- \par We only have to check that the library is installed
- \verbinclude libt2n-example1-client/configure.in
- \par The Makefile.am needs nothing special
- \verbinclude libt2n-example1-client/Makefile.am
- \par The client program
- \verbinclude libt2n-example1-client/client.cpp
-
- \par Build and install the package
- \verbatim
- autoreconf -f -i && ./configure && make install
- \endverbatim
-
- \par Test
- \verbatim
-$ cd /tmp
-$ file socket
-socket: cannot open `socket' (No such file or directory)
-$ libt2n-example1-server &
-[1] 7711
-$ file socket
-socket: socket
-$ libt2n-example1-client && echo ok
-ok
-$ kill %1
-$ rm socket
- \endverbatim
-
-
-*/
-
-/*!
- \example t2nexample.cpp
- example input for libt2n-codegen
-*/
-
#include
#include
#include
@@ -200,19 +106,14 @@ std::string get_namespace(const xmlpp::Element* root, const std::string &id)
return element->get_attribute("name")->get_value();
}
-//! extract group from attributes
-std::string
-extract_group(const std::string &attrs)
+//! procedure marked for export?
+bool
+is_marked(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);
+ return (p!=std::string::npos);
}
struct type_info
@@ -268,8 +169,15 @@ type_info get_type(const xmlpp::Element* root, const std::string &id)
ret.name=std::string("const ")+ret.name;
return ret;
}else if (tag=="PointerType") {
- // not yet supported
- return error;
+ // todo: nearly the same as reference type handling
+ assert(element->get_attribute("type"));
+ type_info ret(get_type(root, element->get_attribute("type")->get_value()));
+ if (ret==error) return error;
+ // at the moment we only support const &
+ // todo: nice error message!
+ if ((ret.noref_name=strip(ret.name,"const ")).empty()) return error;
+ ret.name=ret.name+"*";
+ return ret;
}
assert(element->get_attribute("name"));
@@ -354,7 +262,7 @@ protected:
// attributes are speparated by spaces?
t2n_procedure f;
- if (extract_group(attributes->get_value()).empty()) return;
+ if (!is_marked(attributes->get_value())) return;
// we need the return type
f.ret_type=get_type(root, returns->get_value());
@@ -472,7 +380,8 @@ void output_common_hpp(std::ostream &o, const std::string &group, const std::lis
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 << ")";
+ // pointers are const pointers and must be dereferenced
+ o << ait->first << "(" << ((ait->second.name.find_first_of('*')!=std::string::npos) ? "*" : "" ) << "_" << ait->first << ")";
}
o << " {}\n"
<< " libt2n::result* operator()();\n"
@@ -555,6 +464,9 @@ void output_server_cpp(std::ostream &o, const std::string &group, const std::lis
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 << ")); }\n";