From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBBG2-0002QE-Qa for qemu-devel@nongnu.org; Fri, 23 Mar 2012 16:38:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBBFz-0007QH-7I for qemu-devel@nongnu.org; Fri, 23 Mar 2012 16:38:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBBFy-0007PX-VB for qemu-devel@nongnu.org; Fri, 23 Mar 2012 16:38:43 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2NKcf1J016979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 23 Mar 2012 16:38:41 -0400 Date: Fri, 23 Mar 2012 17:38:46 -0300 From: Luiz Capitulino Message-ID: <20120323173846.7d0e3eb8@doriath.home> In-Reply-To: <1332251675-26352-1-git-send-email-fsimonce@redhat.com> References: <20120316161648.22bb81d8@doriath.home> <1332251675-26352-1-git-send-email-fsimonce@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3] qapi: add c_fun to escape function names List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Federico Simoncelli Cc: pbonzini@redhat.com, qemu-devel@nongnu.org On Tue, 20 Mar 2012 13:54:35 +0000 Federico Simoncelli wrote: > Signed-off-by: Federico Simoncelli This looks good now, it's only missing a good description. > --- > scripts/qapi-commands.py | 14 +++++++------- > scripts/qapi-types.py | 4 ++-- > scripts/qapi-visit.py | 4 ++-- > scripts/qapi.py | 5 ++++- > 4 files changed, 15 insertions(+), 12 deletions(-) > > diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py > index 3aabf61..30a24d2 100644 > --- a/scripts/qapi-commands.py > +++ b/scripts/qapi-commands.py > @@ -42,7 +42,7 @@ def generate_command_decl(name, args, ret_type): > return mcgen(''' > %(ret_type)s qmp_%(name)s(%(args)sError **errp); > ''', > - ret_type=c_type(ret_type), name=c_var(name), args=arglist).strip() > + ret_type=c_type(ret_type), name=c_fun(name), args=arglist).strip() > > def gen_sync_call(name, args, ret_type, indent=0): > ret = "" > @@ -59,7 +59,7 @@ def gen_sync_call(name, args, ret_type, indent=0): > %(retval)sqmp_%(name)s(%(args)serrp); > > ''', > - name=c_var(name), args=arglist, retval=retval).rstrip() > + name=c_fun(name), args=arglist, retval=retval).rstrip() > if ret_type: > ret += "\n" + mcgen('''' > if (!error_is_set(errp)) { > @@ -74,7 +74,7 @@ if (!error_is_set(errp)) { > def gen_marshal_output_call(name, ret_type): > if not ret_type: > return "" > - return "qmp_marshal_output_%s(retval, ret, errp);" % c_var(name) > + return "qmp_marshal_output_%s(retval, ret, errp);" % c_fun(name) > > def gen_visitor_output_containers_decl(ret_type): > ret = "" > @@ -198,16 +198,16 @@ static void qmp_marshal_output_%(c_name)s(%(c_ret_type)s ret_in, QObject **ret_o > qapi_dealloc_visitor_cleanup(md); > } > ''', > - c_ret_type=c_type(ret_type), c_name=c_var(name), > + c_ret_type=c_type(ret_type), c_name=c_fun(name), > visitor=type_visitor(ret_type)) > > return ret > > def gen_marshal_input_decl(name, args, ret_type, middle_mode): > if middle_mode: > - return 'int qmp_marshal_input_%s(Monitor *mon, const QDict *qdict, QObject **ret)' % c_var(name) > + return 'int qmp_marshal_input_%s(Monitor *mon, const QDict *qdict, QObject **ret)' % c_fun(name) > else: > - return 'static void qmp_marshal_input_%s(QDict *args, QObject **ret, Error **errp)' % c_var(name) > + return 'static void qmp_marshal_input_%s(QDict *args, QObject **ret, Error **errp)' % c_fun(name) > > > > @@ -298,7 +298,7 @@ def gen_registry(commands): > registry += mcgen(''' > qmp_register_command("%(name)s", qmp_marshal_input_%(c_name)s); > ''', > - name=cmd['command'], c_name=c_var(cmd['command'])) > + name=cmd['command'], c_name=c_fun(cmd['command'])) > pop_indent() > ret = mcgen(''' > static void qmp_init_marshal(void) > diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py > index 727fb77..4a734f5 100644 > --- a/scripts/qapi-types.py > +++ b/scripts/qapi-types.py > @@ -100,7 +100,7 @@ typedef enum %(name)s > %(abbrev)s_%(value)s = %(i)d, > ''', > abbrev=de_camel_case(name).upper(), > - value=c_var(value).upper(), > + value=c_fun(value).upper(), > i=i) > i += 1 > > @@ -126,7 +126,7 @@ struct %(name)s > %(c_type)s %(c_name)s; > ''', > c_type=c_type(typeinfo[key]), > - c_name=c_var(key)) > + c_name=c_fun(key)) > > ret += mcgen(''' > }; > diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py > index 54117d4..78c947c 100644 > --- a/scripts/qapi-visit.py > +++ b/scripts/qapi-visit.py > @@ -129,9 +129,9 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** > break; > ''', > abbrev = de_camel_case(name).upper(), > - enum = de_camel_case(key).upper(), > + enum = c_fun(de_camel_case(key)).upper(), > c_type=members[key], > - c_name=c_var(key)) > + c_name=c_fun(key)) > > ret += mcgen(''' > default: > diff --git a/scripts/qapi.py b/scripts/qapi.py > index 6e05469..e062336 100644 > --- a/scripts/qapi.py > +++ b/scripts/qapi.py > @@ -131,7 +131,10 @@ def camel_case(name): > return new_name > > def c_var(name): > - return '_'.join(name.split('-')).lstrip("*") > + return name.replace('-', '_').lstrip("*") > + > +def c_fun(name): > + return c_var(name).replace('.', '_') > > def c_list_type(name): > return '%sList' % name