jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

moved methods to annotation syntax

Browse source
This commit is contained in:
Andreas Volz 2008-09-30 23:36:46 +02:00
parent 13219dd9fc
commit 33ad5e86ba
1 changed files with 77 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

112
tools/xml2cpp.cpp
View file

@ -363,13 +363,26 @@ void generate_proxy(Xml::Document &doc, const char *filename)
Xml::Nodes args = method["arg"]; Xml::Nodes args = method["arg"];
Xml::Nodes args_in = args.select("direction","in"); Xml::Nodes args_in = args.select("direction","in");
Xml::Nodes args_out = args.select("direction","out"); Xml::Nodes args_out = args.select("direction","out");
Xml::Nodes annotations = method["annotation"]; Xml::Nodes annotations = args["annotation"];
Xml::Nodes annotations_noreply = annotations.select("name","org.freedesktop.DBus.NoReply"); Xml::Nodes annotations_noreply = annotations.select("name","org.freedesktop.DBus.NoReply");
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object; string arg_object;
bool annotation_noreply_value = false;
if (args_out.size() > 0)
// parse method level noreply annotations
if (annotations_noreply.size() > 0)
{ {
string arg_object = args_out.front()->get("object"); string annotation_noreply_value_str = annotations_noreply.front()->get("value");
if (annotation_noreply_value_str == "yes")
{
annotation_noreply_value = true;
}
}
if (annotations_object.size() > 0)
{
arg_object = annotations_object.front()->get("value");
} }
if (args_out.size() == 0 || args_out.size() > 1) if (args_out.size() == 0 || args_out.size() > 1)
@ -395,7 +408,14 @@ void generate_proxy(Xml::Document &doc, const char *filename)
for (Xml::Nodes::iterator ai = args_in.begin(); ai != args_in.end(); ++ai, ++i) for (Xml::Nodes::iterator ai = args_in.begin(); ai != args_in.end(); ++ai, ++i)
{ {
Xml::Node &arg = **ai; Xml::Node &arg = **ai;
string arg_object = arg.get("object"); Xml::Nodes annotations = arg["annotation"];
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
{
arg_object = annotations_object.front()->get("value");
}
// generate basic signature only if no object name available... // generate basic signature only if no object name available...
if (!arg_object.length()) if (!arg_object.length())
@ -424,11 +444,18 @@ void generate_proxy(Xml::Document &doc, const char *filename)
if (args_out.size() > 1) if (args_out.size() > 1)
{ {
// generate all 'out' arguments for a method signature // generate all 'out' arguments for a method signature
unsigned int i = 0; unsigned int j = 0;
for (Xml::Nodes::iterator ao = args_out.begin(); ao != args_out.end(); ++ao, ++i) for (Xml::Nodes::iterator ao = args_out.begin(); ao != args_out.end(); ++ao, ++j)
{ {
Xml::Node &arg = **ao; Xml::Node &arg = **ao;
string arg_object = arg.get("object"); Xml::Nodes annotations = args_out["annotation"];
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
{
arg_object = annotations_object.front()->get("value");
}
// generate basic signature only if no object name available... // generate basic signature only if no object name available...
if (!arg_object.length()) if (!arg_object.length())
@ -448,7 +475,7 @@ void generate_proxy(Xml::Document &doc, const char *filename)
if (arg_name.length()) if (arg_name.length())
body << " " << arg_name; body << " " << arg_name;
else else
body << " argout" << i; body << " argout" << j;
if (i+1 != args_out.size()) if (i+1 != args_out.size())
body << ", "; body << ", ";
@ -466,17 +493,24 @@ void generate_proxy(Xml::Document &doc, const char *filename)
} }
// generate all 'in' arguments for a method body // generate all 'in' arguments for a method body
unsigned int j = 0; i = 0;
for (Xml::Nodes::iterator ai = args_in.begin(); ai != args_in.end(); ++ai, ++j) for (Xml::Nodes::iterator ai = args_in.begin(); ai != args_in.end(); ++ai, ++i)
{ {
Xml::Node &arg = **ai; Xml::Node &arg = **ai;
string arg_name = arg.get("name"); string arg_name = arg.get("name");
string arg_object = arg.get("object"); Xml::Nodes annotations = arg["annotation"];
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
{
arg_object = annotations_object.front()->get("value");
}
if (!arg_name.length()) if (!arg_name.length())
{ {
arg_name = "argin"; arg_name = "argin";
arg_name += toString <uint> (j); arg_name += toString <uint> (i);
} }
// generate extra code to wrap object // generate extra code to wrap object
@ -493,42 +527,44 @@ void generate_proxy(Xml::Document &doc, const char *filename)
body << tab << tab << "call.member(\"" << method.get("name") << "\");" << endl; body << tab << tab << "call.member(\"" << method.get("name") << "\");" << endl;
// generate noreply method calls // generate noreply/reply method calls
unsigned int k = 0; if (annotation_noreply_value)
string invoke_method = "::DBus::Message ret = invoke_method"; {
for (Xml::Nodes::iterator an = annotations_noreply.begin(); an != annotations_noreply.end(); ++an, ++k)
{
Xml::Node &annotation = **an;
string annotation_value = annotation.get("value");
if (annotation_value == "yes")
{
if (args_out.size ()) if (args_out.size ())
{ {
cerr << "Function: " << method.get("name") << ":" << endl; cerr << "Function: " << method.get("name") << ":" << endl;
cerr << "Option' org.freedesktop.DBus.NoReply' not allowed for methods with 'out' variables!" << endl << "-> Option ignored!" << endl; cerr << "Option' org.freedesktop.DBus.NoReply' not allowed for methods with 'out' variables!" << endl << "-> Option ignored!" << endl;
body << tab << tab << "::DBus::Message ret = invoke_method";
} }
else else
{ {
invoke_method = "invoke_method_noreply"; body << tab << tab << "::DBus::Message ret = invoke_method_noreply";
} }
break;
}
} }
else
body << tab << tab << invoke_method << "(call);" << endl; {
body << tab << tab << "::DBus::Message ret = invoke_method";
}
body << "(call);" << endl;
if (args_out.size() > 0) if (args_out.size() > 0)
{ {
body << tab << tab << "::DBus::MessageIter ri = ret.reader();" << endl body << tab << tab << "::DBus::MessageIter ri = ret.reader();" << endl
<< endl; << endl;
} }
// generate 'out' value as return if only one existing // generate 'out' values as return if only one existing
if (args_out.size() == 1) if (args_out.size() == 1)
{ {
string arg_object = args_out.front()->get("object"); Xml::Nodes annotations = args_out["annotation"];
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
{
arg_object = annotations_object.front()->get("value");
}
if (arg_object.length()) if (arg_object.length())
{ {
@ -556,9 +592,15 @@ void generate_proxy(Xml::Document &doc, const char *filename)
for (Xml::Nodes::iterator ao = args_out.begin(); ao != args_out.end(); ++ao, ++i) for (Xml::Nodes::iterator ao = args_out.begin(); ao != args_out.end(); ++ao, ++i)
{ {
Xml::Node &arg = **ao; Xml::Node &arg = **ao;
string arg_name = arg.get("name"); string arg_name = arg.get("name");
string arg_object = arg.get("object"); Xml::Nodes annotations = arg["annotation"];
Xml::Nodes annotations_object = annotations.select("name","org.freedesktop.DBus.Object");
string arg_object;
if (annotations_object.size() > 0)
{
arg_object = annotations_object.front()->get("value");
}
if (!arg_name.length()) if (!arg_name.length())
{ {