From nobody Mon Feb 9 16:19:23 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614041170; cv=none; d=zohomail.com; s=zohoarc; b=dnA5tr8yQfUhM8ueT7VBylj0qGByUvm4o1sVIkO27LyMJYnH21VG2tcoD9MAH0ribCxdPoedskWHrPMFlw3Va0utYJP7Xuk2g0dz3ZDAB4XMuxhArePOnn4aSZbERbgrfP9eiGl2oJ2zwU2uwxUZ2NS7BahOTBB8JUj0b9/3yPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614041170; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J4cuqkJAUQKR5Gdt+K1rgEmNceiXfV/hTv6w2GRuTgE=; b=YNHmC7g1m17ICAhvXvyrpjl2ZcMoJeU/4xtPp9UIvSjAjNJP9OgnZbl8rFkqoAwFyCy04bIhqlW0L4kzUgW2DBre838TlB3GjW9XJKbiIoXLnWUUm2/cSY/n4n1VvdGteQ+uGD1duUUoyXnBbpJL1VsNYvpdEQSPnbiP8uJs7VA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614041170118461.770903200951; Mon, 22 Feb 2021 16:46:10 -0800 (PST) Received: from localhost ([::1]:59792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lELq5-00062R-3A for importer@patchew.org; Mon, 22 Feb 2021 19:46:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lELgi-0002Qn-EV for qemu-devel@nongnu.org; Mon, 22 Feb 2021 19:36:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lELel-0005Nk-QD for qemu-devel@nongnu.org; Mon, 22 Feb 2021 19:36:27 -0500 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-276-isTpgk2gMmC380BbHBmlfQ-1; Mon, 22 Feb 2021 19:34:25 -0500 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 48F91107ACC7; Tue, 23 Feb 2021 00:34:24 +0000 (UTC) Received: from scv.redhat.com (ovpn-112-247.rdu2.redhat.com [10.10.112.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C7D35D6D5; Tue, 23 Feb 2021 00:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614040467; 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=J4cuqkJAUQKR5Gdt+K1rgEmNceiXfV/hTv6w2GRuTgE=; b=DAnyEDWUnVeAabG16ZL9DkSHZKHbE3joxDyxIi2nF/uGqgiM3Ze2Y4ZAShaI27gLAXWEZ6 4JUb14ciuBV2m2iAQIkavmZ+K6JTdml8IQI304LlpUTi8g3Ca62n0bkcukBIYXCYjJou3s TnEmdODpnFVujdE4ciFbcspKDlaz5dQ= X-MC-Unique: isTpgk2gMmC380BbHBmlfQ-1 From: John Snow To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH v3 16/16] qapi/expr.py: Use an expression checker dispatch table Date: Mon, 22 Feb 2021 19:34:08 -0500 Message-Id: <20210223003408.964543-17-jsnow@redhat.com> In-Reply-To: <20210223003408.964543-1-jsnow@redhat.com> References: <20210223003408.964543-1-jsnow@redhat.com> 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=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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: Michael Roth , John Snow , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This enforces a type signature against all of the top-level expression check routines without necessarily needing to create some overcomplicated class hierarchy for them. Signed-off-by: John Snow --- scripts/qapi/expr.py | 64 +++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py index 3672637487b..f1c58483915 100644 --- a/scripts/qapi/expr.py +++ b/scripts/qapi/expr.py @@ -31,9 +31,12 @@ structures and contextual semantic validation. """ =20 +from enum import Enum import re from typing import ( + Callable, Collection, + Dict, Iterable, List, MutableMapping, @@ -505,6 +508,29 @@ def check_event(expr: Expression, info: QAPISourceInfo= ) -> None: check_type(args, info, "'data'", allow_dict=3Dnot boxed) =20 =20 +class ExpressionType(str, Enum): + INCLUDE =3D 'include' + ENUM =3D 'enum' + UNION =3D 'union' + ALTERNATE =3D 'alternate' + STRUCT =3D 'struct' + COMMAND =3D 'command' + EVENT =3D 'event' + + def __str__(self) -> str: + return str(self.value) + + +_CHECK_FN: Dict[str, Callable[[Expression, QAPISourceInfo], None]] =3D { + 'enum': check_enum, + 'union': check_union, + 'alternate': check_alternate, + 'struct': check_struct, + 'command': check_command, + 'event': check_event, +} + + def check_exprs(exprs: List[_JSObject]) -> List[_JSObject]: """ Validate and normalize a list of parsed QAPI schema expressions. [RW] @@ -531,24 +557,16 @@ def check_exprs(exprs: List[_JSObject]) -> List[_JSOb= ject]: assert tmp is None or isinstance(tmp, QAPIDoc) doc: Optional[QAPIDoc] =3D tmp =20 - if 'include' in expr: - continue - - if 'enum' in expr: - meta =3D 'enum' - elif 'union' in expr: - meta =3D 'union' - elif 'alternate' in expr: - meta =3D 'alternate' - elif 'struct' in expr: - meta =3D 'struct' - elif 'command' in expr: - meta =3D 'command' - elif 'event' in expr: - meta =3D 'event' + for kind in ExpressionType: + if kind in expr: + meta =3D kind + break else: raise QAPISemError(info, "expression is missing metatype") =20 + if meta =3D=3D ExpressionType.INCLUDE: + continue + name =3D cast(str, expr[meta]) # Asserted right below: check_name_is_str(name, info, "'%s'" % meta) info.set_defn(meta, name) @@ -563,21 +581,7 @@ def check_exprs(exprs: List[_JSObject]) -> List[_JSObj= ect]: raise QAPISemError(info, "documentation comment required") =20 - if meta =3D=3D 'enum': - check_enum(expr, info) - elif meta =3D=3D 'union': - check_union(expr, info) - elif meta =3D=3D 'alternate': - check_alternate(expr, info) - elif meta =3D=3D 'struct': - check_struct(expr, info) - elif meta =3D=3D 'command': - check_command(expr, info) - elif meta =3D=3D 'event': - check_event(expr, info) - else: - assert False, 'unexpected meta type' - + _CHECK_FN[meta](expr, info) check_if(expr, info, meta) check_features(expr.get('features'), info) check_flags(expr, info) --=20 2.29.2