From patchwork Thu Nov 5 12:27:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 319906 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=-8.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, 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 5A3D1C00A89 for ; Thu, 5 Nov 2020 12:32:41 +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 8943520782 for ; Thu, 5 Nov 2020 12:32:40 +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="RgxJcPWP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8943520782 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]:58624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaeRT-0005hk-Di for qemu-devel@archiver.kernel.org; Thu, 05 Nov 2020 07:32:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaeO3-00021Z-3t for qemu-devel@nongnu.org; Thu, 05 Nov 2020 07:29:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaeNv-0004es-2f for qemu-devel@nongnu.org; Thu, 05 Nov 2020 07:29:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604579336; 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; bh=63roSaGqOmt6QmqIZY8qhYP1lJMEyG8r5lu5HbU+G7k=; b=RgxJcPWPO65p+bvQdtEpJrZGDk9huufUUsCyhCCVqZJv7q3JrHr8/8VQ71qgX02K+1kVir MkES3onP0I7DgeE5JoyZ7iGwvUjhglhk5n7ZgV8K0yyQIOzAwIriiNGV/YZvNaRFbijtIV iE97gn5WVFEAiZSDkZErh4/Nsq4J+Ng= 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-405-7vgW5gfRPeyjn_GRr328rQ-1; Thu, 05 Nov 2020 07:28:53 -0500 X-MC-Unique: 7vgW5gfRPeyjn_GRr328rQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2115510B9CAA; Thu, 5 Nov 2020 12:28:52 +0000 (UTC) Received: from localhost (unknown [10.36.110.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id C382F614F5; Thu, 5 Nov 2020 12:28:11 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v2 0/9] qapi: untie 'if' conditions from C preprocessor Date: Thu, 5 Nov 2020 16:27:59 +0400 Message-Id: <20201105122808.1182973-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/05 01:14:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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: Peter Maydell , Michael Roth , Juan Quintela , Markus Armbruster , "Dr. David Alan Gilbert" , Gerd Hoffmann , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , jsnow@redhat.com, Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Hi, This series makes the 'if' conditions less liberal, by formalizing a simple expression tree based on bare boolean logic of configure option identifiers. (this will allow to express conditions in Rust in my QAPI-Rust PoC series, but it is worth a standalone post) This is based on John Snow QAPI cleanup branch: https://gitlab.com/jsnow/qemu/-/tree/python-qapi-cleanup-pt6 thanks v2: - fix the normalization step to handle recursive expr - replace IfCond by QAPISchemaIf (JohnS) - commit message and documentation tweaks - mypy/flake8/isort Marc-André Lureau (9): qapi: replace List[str] by QAPISchemaIf qapi: move gen_if/gen_endif to QAPIIfSchema qapi: start building an 'if' predicate tree qapi: introduce IfPredicateList and IfAny qapi: add IfNot qapi: normalize 'if' condition to IfPredicate tree qapi: convert 'if' C expressions to the new literal form qapi: make 'if' condition strings simple identifiers docs: update the documentation about schema configuration docs/devel/qapi-code-gen.txt | 32 ++-- docs/sphinx/qapidoc.py | 6 +- qapi/block-core.json | 16 +- qapi/char.json | 8 +- qapi/machine-target.json | 28 +++- qapi/migration.json | 10 +- qapi/misc-target.json | 35 +++-- qapi/ui.json | 48 +++--- scripts/qapi/commands.py | 3 +- scripts/qapi/common.py | 85 +++++++++-- scripts/qapi/events.py | 3 +- scripts/qapi/expr.py | 64 +++++--- scripts/qapi/gen.py | 21 +-- scripts/qapi/introspect.py | 36 +++-- scripts/qapi/schema.py | 138 ++++++++++++------ scripts/qapi/types.py | 39 +++-- scripts/qapi/visit.py | 23 ++- .../alternate-branch-if-invalid.err | 2 +- tests/qapi-schema/bad-if-empty.err | 2 +- tests/qapi-schema/bad-if-list.err | 2 +- tests/qapi-schema/bad-if.err | 3 +- tests/qapi-schema/bad-if.json | 2 +- tests/qapi-schema/doc-good.json | 6 +- tests/qapi-schema/doc-good.out | 12 +- tests/qapi-schema/enum-if-invalid.err | 3 +- tests/qapi-schema/features-if-invalid.err | 2 +- tests/qapi-schema/features-missing-name.json | 2 +- tests/qapi-schema/qapi-schema-test.json | 55 +++---- tests/qapi-schema/qapi-schema-test.out | 63 ++++---- .../qapi-schema/struct-member-if-invalid.err | 2 +- tests/qapi-schema/union-branch-if-invalid.err | 2 +- tests/test-qmp-cmds.c | 1 + 32 files changed, 456 insertions(+), 298 deletions(-) -- 2.29.0