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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 E75B9C4361B for ; Wed, 16 Dec 2020 10:20:10 +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 1A2172313B for ; Wed, 16 Dec 2020 10:20:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A2172313B 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]:41466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpTui-00084B-PP for qemu-devel@archiver.kernel.org; Wed, 16 Dec 2020 05:20:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpTto-0007H1-7C for qemu-devel@nongnu.org; Wed, 16 Dec 2020 05:19:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpTtl-0004La-Kb for qemu-devel@nongnu.org; Wed, 16 Dec 2020 05:19:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608113948; 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=NyoYEzXAfUmOucNAioVFmscjTTZCXeBNzcLiQri/xDg=; b=Qs9o6CONVvsts17PUEzQhnv4ycZrB8E8nYf63TxaPZyYKiLoJszay1FXc+epo3C2fSlBEB Fz2N7hwriuX7t8Sdtvw3KJDTXEm2nbnneqzB7lHkIFTiLm9ViXAXMx89noh02ynUcYjPwR YzMpYvf9vrqK1Ormf/bnW91ucLejlJg= 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-336-1gkBhUqiMcyV5RdDSEp8SA-1; Wed, 16 Dec 2020 05:19:05 -0500 X-MC-Unique: 1gkBhUqiMcyV5RdDSEp8SA-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 662641927805 for ; Wed, 16 Dec 2020 10:19:04 +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 3BD775D719; Wed, 16 Dec 2020 10:19:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B11B611329A5; Wed, 16 Dec 2020 11:18:58 +0100 (CET) From: Markus Armbruster To: John Snow Subject: Re: [PATCH 08/12] qapi/schema: make QAPISourceInfo mandatory References: <20201214235327.1007124-1-jsnow@redhat.com> <20201214235327.1007124-9-jsnow@redhat.com> Date: Wed, 16 Dec 2020 11:18:58 +0100 In-Reply-To: <20201214235327.1007124-9-jsnow@redhat.com> (John Snow's message of "Mon, 14 Dec 2020 18:53:23 -0500") Message-ID: <875z52rr3h.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.15 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-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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_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: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , qemu-devel@nongnu.org, Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > -- > > events.py had an info to route, was it by choice that it wasn't before? See below. I figure this is intentionally below the -- line, but ... > Signed-off-by: John Snow ... this should be above it. > --- > scripts/qapi/events.py | 2 +- > scripts/qapi/schema.py | 23 +++++++++++++---------- > scripts/qapi/types.py | 9 +++++---- > scripts/qapi/visit.py | 6 +++--- > 4 files changed, 22 insertions(+), 18 deletions(-) > > diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py > index 9851653b9d11..9ba4f109028d 100644 > --- a/scripts/qapi/events.py > +++ b/scripts/qapi/events.py > @@ -225,7 +225,7 @@ def visit_event(self, > self._event_emit_name)) > # Note: we generate the enum member regardless of @ifcond, to > # keep the enumeration usable in target-independent code. > - self._event_enum_members.append(QAPISchemaEnumMember(name, None)) > + self._event_enum_members.append(QAPISchemaEnumMember(name, info)) We pass None because errors should never happen, and None makes that quite clear. We don't actually have a built-in QAPISchemaEnumType for the event enum. We merely generate a C enum QAPIEvent along with macro QAPIEvent_str(), by passing self._event_emit_name, self._event_enum_members straight to gen_enum() and gen_enum_lookup(). If we did build a QAPISchemaEnumType, and used it to diagnose clashes, then clashes would be reported like mumble.json: In event 'A-B': mumble.json: 2: value 'A-B' collides with value 'A_B' leaving you guessing what "value" means, and where 'A_B' may be. Bug: we don't diagnose certain event name clashes. I'll fix it. > > > def gen_events(schema: QAPISchema, > diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py > index 720449feee4d..d5f19732b516 100644 > --- a/scripts/qapi/schema.py > +++ b/scripts/qapi/schema.py > @@ -23,6 +23,7 @@ > from .error import QAPIError, QAPISemError > from .expr import check_exprs > from .parser import QAPISchemaParser > +from .source import QAPISourceInfo > > > class QAPISchemaEntity: > @@ -36,10 +37,10 @@ def __init__(self, name, info, doc, ifcond=None, features=None): > self.name = name > self._module = None > # For explicitly defined entities, info points to the (explicit) > - # definition. For builtins (and their arrays), info is None. > - # For implicitly defined entities, info points to a place that > - # triggered the implicit definition (there may be more than one > - # such place). > + # definition. For builtins (and their arrays), info is a null-object > + # sentinel that evaluates to False. For implicitly defined entities, > + # info points to a place that triggered the implicit definition > + # (there may be more than one such place). s/builtins/built-in types/ The meaning of "a null object sentinel" is less than clear. Perhaps "a special object". > self.info = info > self.doc = doc > self._ifcond = ifcond or [] > @@ -209,7 +210,7 @@ class QAPISchemaBuiltinType(QAPISchemaType): > meta = 'built-in' > > def __init__(self, name, json_type, c_type): > - super().__init__(name, None, None) > + super().__init__(name, QAPISourceInfo.builtin(), None) > assert not c_type or isinstance(c_type, str) > assert json_type in ('string', 'number', 'int', 'boolean', 'null', > 'value') > @@ -871,7 +872,7 @@ def resolve_type(self, name, info, what): > return typ > > def _module_name(self, fname): > - if fname is None: > + if not fname: > return None > return os.path.relpath(fname, self._schema_dir) > Sure this hunk belongs to this patch? > @@ -897,9 +898,11 @@ def _def_builtin_type(self, name, json_type, c_type): > # be nice, but we can't as long as their generated code > # (qapi-builtin-types.[ch]) may be shared by some other > # schema. > - self._make_array_type(name, None) > + self._make_array_type(name, QAPISourceInfo.builtin()) > > def _def_predefineds(self): > + info = QAPISourceInfo.builtin() > + Everything else gets its very own copy of the "no source info" object, except for the stuff defined here, which gets to share one. Isn't that odd? > for t in [('str', 'string', 'char' + POINTER_SUFFIX), > ('number', 'number', 'double'), > ('int', 'int', 'int64_t'), > @@ -917,15 +920,15 @@ def _def_predefineds(self): > ('null', 'null', 'QNull' + POINTER_SUFFIX)]: > self._def_builtin_type(*t) > self.the_empty_object_type = QAPISchemaObjectType( > - 'q_empty', None, None, None, None, None, [], None) > + 'q_empty', info, None, None, None, None, [], None) > self._def_entity(self.the_empty_object_type) > > qtypes = ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', > 'qbool'] > qtype_values = self._make_enum_members( > - [{'name': n} for n in qtypes], None) > + [{'name': n} for n in qtypes], info) > > - self._def_entity(QAPISchemaEnumType('QType', None, None, None, None, > + self._def_entity(QAPISchemaEnumType('QType', info, None, None, None, > qtype_values, 'QTYPE')) > > def _make_features(self, features, info): > diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py > index 2b4916cdaa1b..a3a16284006b 100644 > --- a/scripts/qapi/types.py > +++ b/scripts/qapi/types.py > @@ -71,7 +71,8 @@ def gen_enum(name: str, > members: List[QAPISchemaEnumMember], > prefix: Optional[str] = None) -> str: > # append automatically generated _MAX value > - enum_members = members + [QAPISchemaEnumMember('_MAX', None)] > + enum_members = members + [ > + QAPISchemaEnumMember('_MAX', QAPISourceInfo.builtin())] > > ret = mcgen(''' > > @@ -306,7 +307,7 @@ def _gen_type_cleanup(self, name: str) -> None: > > def visit_enum_type(self, > name: str, > - info: Optional[QAPISourceInfo], > + info: QAPISourceInfo, > ifcond: List[str], > features: List[QAPISchemaFeature], > members: List[QAPISchemaEnumMember], > @@ -317,7 +318,7 @@ def visit_enum_type(self, > > def visit_array_type(self, > name: str, > - info: Optional[QAPISourceInfo], > + info: QAPISourceInfo, > ifcond: List[str], > element_type: QAPISchemaType) -> None: > with ifcontext(ifcond, self._genh, self._genc): > @@ -327,7 +328,7 @@ def visit_array_type(self, > > def visit_object_type(self, > name: str, > - info: Optional[QAPISourceInfo], > + info: QAPISourceInfo, > ifcond: List[str], > features: List[QAPISchemaFeature], > base: Optional[QAPISchemaObjectType], > diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py > index 339f1521524c..3f49c307c566 100644 > --- a/scripts/qapi/visit.py > +++ b/scripts/qapi/visit.py > @@ -336,7 +336,7 @@ def _begin_user_module(self, name: str) -> None: > > def visit_enum_type(self, > name: str, > - info: QAPISourceInfo, > + info: Optional[QAPISourceInfo], > ifcond: List[str], > features: List[QAPISchemaFeature], > members: List[QAPISchemaEnumMember], > @@ -347,7 +347,7 @@ def visit_enum_type(self, > > def visit_array_type(self, > name: str, > - info: Optional[QAPISourceInfo], > + info: QAPISourceInfo, > ifcond: List[str], > element_type: QAPISchemaType) -> None: > with ifcontext(ifcond, self._genh, self._genc): > @@ -356,7 +356,7 @@ def visit_array_type(self, > > def visit_object_type(self, > name: str, > - info: Optional[QAPISourceInfo], > + info: QAPISourceInfo, > ifcond: List[str], > features: List[QAPISchemaFeature], > base: Optional[QAPISchemaObjectType],