From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EC39C433B4 for ; Wed, 12 May 2021 21:02:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B6FB613E6 for ; Wed, 12 May 2021 21:02:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B6FB613E6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgw00-0001CD-2d for qemu-devel@archiver.kernel.org; Wed, 12 May 2021 17:02:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgvyn-0000NQ-Nl for qemu-devel@nongnu.org; Wed, 12 May 2021 17:01:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgvyk-00039p-4n for qemu-devel@nongnu.org; Wed, 12 May 2021 17:01:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620853272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J26XSwH5y5ZDvTM0rQmsPS/gB23XIAep4RAl/NRJ18o=; b=b9BjEQ5ogv4ip4BEjZo+AB6UPg4nWrCwApNw04DMcO5H4sl0dx7CicOjqk2bLYbBe+raCp rSUFEm9TJEjol9iahycvEffyhSrrx4MNv0EzeuAvBXjdBoUaOcn8cpWZc4a3MFJCmy7xPo 0CY6wAxPK5/BCSQGdY27IvQbXxBzkW4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-331-5Xv54-p5Ob21dFc7Qdjb2g-1; Wed, 12 May 2021 17:01:10 -0400 X-MC-Unique: 5Xv54-p5Ob21dFc7Qdjb2g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18540800D55 for ; Wed, 12 May 2021 21:01:09 +0000 (UTC) Received: from [10.10.117.64] (ovpn-117-64.rdu2.redhat.com [10.10.117.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC2D65D736; Wed, 12 May 2021 21:01:04 +0000 (UTC) Subject: Re: [PATCH v3 2/9] qapi: move gen_if/gen_endif to QAPISchemaIfCond To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org References: <20210429134032.1125111-1-marcandre.lureau@redhat.com> <20210429134032.1125111-3-marcandre.lureau@redhat.com> From: John Snow Message-ID: <9ebdf3c4-d991-3ad9-1919-6b1f3f95efa6@redhat.com> Date: Wed, 12 May 2021 17:01:04 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210429134032.1125111-3-marcandre.lureau@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: armbru@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 4/29/21 9:40 AM, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Move the generating function to the QAPISchemaIfCond class. > > Signed-off-by: Marc-André Lureau > --- > scripts/qapi/common.py | 20 +------------------- > scripts/qapi/gen.py | 6 ++---- > scripts/qapi/introspect.py | 11 +++-------- > scripts/qapi/schema.py | 18 +++++++++++++++++- > scripts/qapi/types.py | 28 +++++++++++----------------- > scripts/qapi/visit.py | 14 ++++++-------- > 6 files changed, 40 insertions(+), 57 deletions(-) > > diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py > index cbd3fd81d3..b7f475a160 100644 > --- a/scripts/qapi/common.py > +++ b/scripts/qapi/common.py > @@ -12,7 +12,7 @@ > # See the COPYING file in the top-level directory. > > import re > -from typing import Optional, Sequence > +from typing import Optional > > > #: Magic string that gets removed along with all space to its right. > @@ -192,21 +192,3 @@ def guardend(name: str) -> str: > #endif /* %(name)s */ > ''', > name=c_fname(name).upper()) > - > - > -def gen_if(ifcond: Sequence[str]) -> str: > - ret = '' > - for ifc in ifcond: > - ret += mcgen(''' > -#if %(cond)s > -''', cond=ifc) > - return ret > - > - > -def gen_endif(ifcond: Sequence[str]) -> str: > - ret = '' > - for ifc in reversed(ifcond): > - ret += mcgen(''' > -#endif /* %(cond)s */ > -''', cond=ifc) > - return ret > diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py > index 1c5b190276..ab26d5c937 100644 > --- a/scripts/qapi/gen.py > +++ b/scripts/qapi/gen.py > @@ -24,8 +24,6 @@ > from .common import ( > c_fname, > c_name, > - gen_endif, > - gen_if, > guardend, > guardstart, > mcgen, > @@ -95,9 +93,9 @@ def _wrap_ifcond(ifcond: QAPISchemaIfCond, before: str, after: str) -> str: > if added[0] == '\n': > out += '\n' > added = added[1:] > - out += gen_if(ifcond.ifcond) > + out += ifcond.gen_if() > out += added > - out += gen_endif(ifcond.ifcond) > + out += ifcond.gen_endif() > return out > > > diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py > index 77a8c33ad4..a2a8a57b9a 100644 > --- a/scripts/qapi/introspect.py > +++ b/scripts/qapi/introspect.py > @@ -22,12 +22,7 @@ > Union, > ) > > -from .common import ( > - c_name, > - gen_endif, > - gen_if, > - mcgen, > -) > +from .common import c_name, mcgen > from .gen import QAPISchemaMonolithicCVisitor > from .schema import ( > QAPISchema, > @@ -124,10 +119,10 @@ def indent(level: int) -> str: > if obj.comment: > ret += indent(level) + f"/* {obj.comment} */\n" > if obj.ifcond: > - ret += gen_if(obj.ifcond.ifcond) > + ret += obj.ifcond.gen_if() > ret += _tree_to_qlit(obj.value, level) > if obj.ifcond: > - ret += '\n' + gen_endif(obj.ifcond.ifcond) > + ret += '\n' + obj.ifcond.gen_endif() > return ret > > ret = '' > diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py > index 7d6f390fa6..8e6d0a5296 100644 > --- a/scripts/qapi/schema.py > +++ b/scripts/qapi/schema.py > @@ -19,7 +19,7 @@ > import re > from typing import Optional > > -from .common import POINTER_SUFFIX, c_name > +from .common import POINTER_SUFFIX, c_name, mcgen > from .error import QAPISemError, QAPISourceError > from .expr import check_exprs > from .parser import QAPISchemaParser > @@ -29,6 +29,22 @@ class QAPISchemaIfCond: > def __init__(self, ifcond=None): > self.ifcond = ifcond or [] > > + def gen_if(self): > + ret = '' > + for ifc in self.ifcond: > + ret += mcgen(''' > +#if %(cond)s > +''', cond=ifc) > + return ret > + > + def gen_endif(self): > + ret = '' > + for ifc in reversed(self.ifcond): > + ret += mcgen(''' > +#endif /* %(cond)s */ > +''', cond=ifc) > + return ret > + > def __bool__(self): > return bool(self.ifcond) > > diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py > index 3673cf0f49..831294fe42 100644 > --- a/scripts/qapi/types.py > +++ b/scripts/qapi/types.py > @@ -15,13 +15,7 @@ > > from typing import List, Optional > > -from .common import ( > - c_enum_const, > - c_name, > - gen_endif, > - gen_if, > - mcgen, > -) > +from .common import c_enum_const, c_name, mcgen > from .gen import QAPISchemaModularCVisitor, ifcontext > from .schema import ( > QAPISchema, > @@ -51,13 +45,13 @@ def gen_enum_lookup(name: str, > ''', > c_name=c_name(name)) > for memb in members: > - ret += gen_if(memb.ifcond.ifcond) > + ret += memb.ifcond.gen_if() > index = c_enum_const(name, memb.name, prefix) > ret += mcgen(''' > [%(index)s] = "%(name)s", > ''', > index=index, name=memb.name) > - ret += gen_endif(memb.ifcond.ifcond) > + ret += memb.ifcond.gen_endif() > > ret += mcgen(''' > }, > @@ -81,12 +75,12 @@ def gen_enum(name: str, > c_name=c_name(name)) > > for memb in enum_members: > - ret += gen_if(memb.ifcond.ifcond) > + ret += memb.ifcond.gen_if() > ret += mcgen(''' > %(c_enum)s, > ''', > c_enum=c_enum_const(name, memb.name, prefix)) > - ret += gen_endif(memb.ifcond.ifcond) > + ret += memb.ifcond.gen_endif() > > ret += mcgen(''' > } %(c_name)s; > @@ -126,7 +120,7 @@ def gen_array(name: str, element_type: QAPISchemaType) -> str: > def gen_struct_members(members: List[QAPISchemaObjectTypeMember]) -> str: > ret = '' > for memb in members: > - ret += gen_if(memb.ifcond.ifcond) > + ret += memb.ifcond.gen_if() > if memb.optional: > ret += mcgen(''' > bool has_%(c_name)s; > @@ -136,7 +130,7 @@ def gen_struct_members(members: List[QAPISchemaObjectTypeMember]) -> str: > %(c_type)s %(c_name)s; > ''', > c_type=memb.type.c_type(), c_name=c_name(memb.name)) > - ret += gen_endif(memb.ifcond.ifcond) > + ret += memb.ifcond.gen_endif() > return ret > > > @@ -159,7 +153,7 @@ def gen_object(name: str, ifcond: QAPISchemaIfCond, > ret += mcgen(''' > > ''') > - ret += gen_if(ifcond.ifcond) > + ret += ifcond.gen_if() > ret += mcgen(''' > struct %(c_name)s { > ''', > @@ -193,7 +187,7 @@ def gen_object(name: str, ifcond: QAPISchemaIfCond, > ret += mcgen(''' > }; > ''') > - ret += gen_endif(ifcond.ifcond) > + ret += ifcond.gen_endif() > > return ret > > @@ -220,13 +214,13 @@ def gen_variants(variants: QAPISchemaVariants) -> str: > for var in variants.variants: > if var.type.name == 'q_empty': > continue > - ret += gen_if(var.ifcond.ifcond) > + ret += var.ifcond.gen_if() > ret += mcgen(''' > %(c_type)s %(c_name)s; > ''', > c_type=var.type.c_unboxed_type(), > c_name=c_name(var.name)) > - ret += gen_endif(var.ifcond.ifcond) > + ret += var.ifcond.gen_endif() > > ret += mcgen(''' > } u; > diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py > index 67721b2470..9d9196a143 100644 > --- a/scripts/qapi/visit.py > +++ b/scripts/qapi/visit.py > @@ -18,8 +18,6 @@ > from .common import ( > c_enum_const, > c_name, > - gen_endif, > - gen_if, > indent, > mcgen, > ) > @@ -79,7 +77,7 @@ def gen_visit_object_members(name: str, > > for memb in members: > deprecated = 'deprecated' in [f.name for f in memb.features] > - ret += gen_if(memb.ifcond.ifcond) > + ret += memb.ifcond.gen_if() > if memb.optional: > ret += mcgen(''' > if (visit_optional(v, "%(name)s", &obj->has_%(c_name)s)) { > @@ -112,7 +110,7 @@ def gen_visit_object_members(name: str, > ret += mcgen(''' > } > ''') > - ret += gen_endif(memb.ifcond.ifcond) > + ret += memb.ifcond.gen_endif() > > if variants: > tag_member = variants.tag_member > @@ -126,7 +124,7 @@ def gen_visit_object_members(name: str, > for var in variants.variants: > case_str = c_enum_const(tag_member.type.name, var.name, > tag_member.type.prefix) > - ret += gen_if(var.ifcond.ifcond) > + ret += var.ifcond.gen_if() > if var.type.name == 'q_empty': > # valid variant and nothing to do > ret += mcgen(''' > @@ -142,7 +140,7 @@ def gen_visit_object_members(name: str, > case=case_str, > c_type=var.type.c_name(), c_name=c_name(var.name)) > > - ret += gen_endif(var.ifcond.ifcond) > + ret += var.ifcond.gen_endif() > ret += mcgen(''' > default: > abort(); > @@ -228,7 +226,7 @@ def gen_visit_alternate(name: str, variants: QAPISchemaVariants) -> str: > c_name=c_name(name)) > > for var in variants.variants: > - ret += gen_if(var.ifcond.ifcond) > + ret += var.ifcond.gen_if() > ret += mcgen(''' > case %(case)s: > ''', > @@ -254,7 +252,7 @@ def gen_visit_alternate(name: str, variants: QAPISchemaVariants) -> str: > ret += mcgen(''' > break; > ''') > - ret += gen_endif(var.ifcond.ifcond) > + ret += var.ifcond.gen_endif() > > ret += mcgen(''' > case QTYPE_NONE: > Tested-by: John Snow Seems fine, though I'm a lot less sure of baking the C-specific stuff right into the class -- I want a bit more distance to the C output instead of less. (Though I do admit that I'm quite fond of centralizing things into classes like this myself. I think if we want to add Rust, Go, Python and other generators that it won't scale the way we want it to.) --js