From nobody Mon Feb 9 11:06:14 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=1616652596; cv=none; d=zohomail.com; s=zohoarc; b=naSAHWib9/VfOnRHvYRMt1DWVJRUrFrNLUA/UZj9uy7RsNTbMjeruRDOF1Xi6yJKv7Hz8aWAl3J807/E36oRVh+vugRyiC4+vYjZnNmU16xNY4ZzOVNvqgmV60JyvCyFOPpvYxXKq4AWoJ9oBB0ghp35fDqT4yhKGI38d+7LFig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616652596; 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=7f/AvFdr21PpuGtG6YguoqEBpnXCTo9cGd7OW2vyeec=; b=UvRg0QAlo+TlToXiONvNVVoLOhwHLwjMeK3v0kafjZjnXUyL+sydPZQxnTmAaYLSDI3bwUwVqbME6KN+Xc87SEVTQoJdDGIyt17c4sexfqWcbzt3IDTKmAbHUsyo1o3549N5bEOTfxl0pku6XkU8QOQNjRVWWS/igCG1lgNbkXc= 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 1616652596373285.50784726413985; Wed, 24 Mar 2021 23:09:56 -0700 (PDT) Received: from localhost ([::1]:34094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPJ9n-0003to-VP for importer@patchew.org; Thu, 25 Mar 2021 02:07:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPJ6K-0002AT-UI for qemu-devel@nongnu.org; Thu, 25 Mar 2021 02:04:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:52671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lPJ6J-0008OV-9V for qemu-devel@nongnu.org; Thu, 25 Mar 2021 02:04:12 -0400 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-570--AIr5BErPmCTVGA5viBpPg-1; Thu, 25 Mar 2021 02:04:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4AD2F108BD06; Thu, 25 Mar 2021 06:04:06 +0000 (UTC) Received: from scv.redhat.com (ovpn-117-181.rdu2.redhat.com [10.10.117.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id A212F866C7; Thu, 25 Mar 2021 06:04:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616652249; 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=7f/AvFdr21PpuGtG6YguoqEBpnXCTo9cGd7OW2vyeec=; b=ZXSEavHg5cfbjhNubmf61foxK2KSwIMFPGSkx2MZ1+ZQT3ssQA74t87xk9by3Fa9nC6Rva i/1SUNOP7Y0Ve8cwOCDXKlVMUOUn0ZkHYpwWLYY7XZEExXuVTj7QsWzojfeZbivLpADLsX VCvW7iHdpJw5/vQZRAWiczld0t00xvc= X-MC-Unique: -AIr5BErPmCTVGA5viBpPg-1 From: John Snow To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH v4 07/19] qapi/expr.py: move string check upwards in check_type Date: Thu, 25 Mar 2021 02:03:44 -0400 Message-Id: <20210325060356.4040114-8-jsnow@redhat.com> In-Reply-To: <20210325060356.4040114-1-jsnow@redhat.com> References: <20210325060356.4040114-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_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: 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" For readability purposes only, shimmy the early return upwards to the top of the function, so cases proceed in order from least to most complex. Signed-off-by: John Snow Reviewed-by: Eduardo Habkost Reviewed-by: Cleber Rosa --- scripts/qapi/expr.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py index 2a2cf7064f..73e7d8cb0d 100644 --- a/scripts/qapi/expr.py +++ b/scripts/qapi/expr.py @@ -169,6 +169,10 @@ def check_type(value, info, source, if value is None: return =20 + # Type name + if isinstance(value, str): + return + # Array type if isinstance(value, list): if not allow_array: @@ -179,10 +183,6 @@ def check_type(value, info, source, source) return =20 - # Type name - if isinstance(value, str): - return - # Anonymous type =20 if not allow_dict: --=20 2.30.2