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=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A8EBBC55ABD for ; Mon, 16 Nov 2020 09:47:58 +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 C40A022314 for ; Mon, 16 Nov 2020 09:47:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="N60by3mJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C40A022314 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]:49972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keb76-0002nJ-KM for qemu-devel@archiver.kernel.org; Mon, 16 Nov 2020 04:47:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keb5n-0001z3-Qt for qemu-devel@nongnu.org; Mon, 16 Nov 2020 04:46:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1keb5i-0004MV-OL for qemu-devel@nongnu.org; Mon, 16 Nov 2020 04:46:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605519987; 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: in-reply-to:in-reply-to:references:references; bh=XHi8ufqVntgZAy381xQvLL3oouyawMPTaLx6nX3rQpg=; b=N60by3mJPpNCaRHOqL5dQJ4tWpb7M9pEhowR+SN5hAuS3dfOv+K1oJrbSqoRjOLQwuKMkf CsgilOCWujCgKocW8bZFrSWtYkZ3vndFS+u69t5gj6YZ7gh3VP/HAADOluHWFbyorQ2Sk1 INiiA1ZoOU+iJts7zcAVQoNGKc2pTrE= 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-476-vVaM0ewmPlCk3KhoXR3a1A-1; Mon, 16 Nov 2020 04:46:12 -0500 X-MC-Unique: vVaM0ewmPlCk3KhoXR3a1A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9718B873159 for ; Mon, 16 Nov 2020 09:46:11 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 631165B4CF; Mon, 16 Nov 2020 09:46:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2223011358BA; Mon, 16 Nov 2020 10:46:09 +0100 (CET) From: Markus Armbruster To: John Snow Subject: Re: [PATCH v2 07/11] qapi/introspect.py: Unify return type of _make_tree() References: <20201026194251.11075-1-jsnow@redhat.com> <20201026194251.11075-8-jsnow@redhat.com> Date: Mon, 16 Nov 2020 10:46:09 +0100 In-Reply-To: <20201026194251.11075-8-jsnow@redhat.com> (John Snow's message of "Mon, 26 Oct 2020 15:42:47 -0400") Message-ID: <87blfx1voe.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/16 04:46:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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: Cleber Rosa , qemu-devel@nongnu.org, Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > Returning two different types conditionally can be complicated to > type. Let's always return a tuple for consistency. Prohibit the use of > annotations with dict-values in this circumstance. It can be implemented > later if and when the need for it arises. > > Signed-off-by: John Snow > --- > scripts/qapi/introspect.py | 21 ++++++++++++--------- > 1 file changed, 12 insertions(+), 9 deletions(-) > > diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py > index 16282f2634b..ef469b6c06e 100644 > --- a/scripts/qapi/introspect.py > +++ b/scripts/qapi/introspect.py > @@ -77,14 +77,12 @@ > > def _make_tree(obj: Union[_DObject, str], ifcond: List[str], > extra: Optional[Annotations] = None > - ) -> TreeValue: > + ) -> Annotated: > if extra is None: > extra = {} > if ifcond: > extra['if'] = ifcond > - if extra: > - return (obj, extra) > - return obj > + return (obj, extra) Less efficient, but that's okay. > > > def _tree_to_qlit(obj: TreeValue, > @@ -98,12 +96,16 @@ def indent(level: int) -> str: > ifobj, extra = obj > ifcond = cast(Optional[Sequence[str]], extra.get('if')) > comment = extra.get('comment') > + > + msg = "Comments and Conditionals not implemented for dict values" > + assert not (suppress_first_indent and (ifcond or comment)), msg What exactly does this assertion guard? > + > ret = '' > if comment: > ret += indent(level) + '/* %s */\n' % comment > if ifcond: > ret += gen_if(ifcond) > - ret += _tree_to_qlit(ifobj, level) > + ret += _tree_to_qlit(ifobj, level, suppress_first_indent) Why do you need to pass on @suppress_first_indent now? > if ifcond: > ret += '\n' + gen_endif(ifcond) > return ret > @@ -152,7 +154,7 @@ def __init__(self, prefix: str, unmask: bool): > ' * QAPI/QMP schema introspection', __doc__) > self._unmask = unmask > self._schema: Optional[QAPISchema] = None > - self._trees: List[TreeValue] = [] > + self._trees: List[Annotated] = [] > self._used_types: List[QAPISchemaType] = [] > self._name_map: Dict[str, str] = {} > self._genc.add(mcgen(''' > @@ -219,7 +221,8 @@ def _use_type(self, typ: QAPISchemaType) -> str: > > @classmethod > def _gen_features(cls, > - features: List[QAPISchemaFeature]) -> List[TreeValue]: > + features: List[QAPISchemaFeature] > + ) -> List[Annotated]: > return [_make_tree(f.name, f.ifcond) for f in features] > > def _gen_tree(self, name: str, mtype: str, obj: _DObject, > @@ -239,7 +242,7 @@ def _gen_tree(self, name: str, mtype: str, obj: _DObject, > self._trees.append(_make_tree(obj, ifcond, extra)) > > def _gen_member(self, > - member: QAPISchemaObjectTypeMember) -> TreeValue: > + member: QAPISchemaObjectTypeMember) -> Annotated: > obj: _DObject = { > 'name': member.name, > 'type': self._use_type(member.type) > @@ -255,7 +258,7 @@ def _gen_variants(self, tag_name: str, > return {'tag': tag_name, > 'variants': [self._gen_variant(v) for v in variants]} > > - def _gen_variant(self, variant: QAPISchemaVariant) -> TreeValue: > + def _gen_variant(self, variant: QAPISchemaVariant) -> Annotated: > obj: _DObject = { > 'case': variant.name, > 'type': self._use_type(variant.type)