From nobody Sat Jul 5 16:02:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521296905229276.10994047796; Sat, 17 Mar 2018 07:28:25 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id EF235356CE; Sat, 17 Mar 2018 14:28:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C9A36620CB; Sat, 17 Mar 2018 14:28:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9303E180BAD7; Sat, 17 Mar 2018 14:28:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2HEOHB3000732 for ; Sat, 17 Mar 2018 10:24:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85F077EE23; Sat, 17 Mar 2018 14:24:17 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D3467EE14 for ; Sat, 17 Mar 2018 14:24:17 +0000 (UTC) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B1BC7E9D8 for ; Sat, 17 Mar 2018 14:24:16 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id o8so14349343wra.1 for ; Sat, 17 Mar 2018 07:24:16 -0700 (PDT) Received: from rst.Home ([2a02:c7d:692a:c500:1ebc:73f3:5f60:b131]) by smtp.gmail.com with ESMTPSA id i66sm11060550wmd.0.2018.03.17.07.24.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 17 Mar 2018 07:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NuGLo16b2FCzSqyCvz0gs/bBRq43HnobmhaSJoTGYhk=; b=Uo/5Z1r5wqmqDlJMJB52HwRoBudNBMa7P/r5jDOSz+g0TqOGQkJRStuwJWAshpEtFh yRYfB6KxfMtNq3VtmKzMeb58Hwd08mjoBS45m9j/MRzeKFVk7Hkn8RcONKd0Rw3KXFDW u83ju00RendFkbrOBPt0/uJjQKjyHk5Y1ZUcB8MqI6nUv+Q5RhNEchIU/UfVhfOg7Bj2 TxJf3e2vtV13X6bjr1xqb4B0EPFY92V1ak1lnxzDUVHRFR/aUS2fQYmTf4klXQZgd3zz uJX7h4NivPcPpzS/dRa8/YTL2DHOdztQ+onINCPP3BsWj9Q+9uX2jOIWRZUohi70YJ21 Zt/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NuGLo16b2FCzSqyCvz0gs/bBRq43HnobmhaSJoTGYhk=; b=fXJwQMINduGidBc0wghlS+lYXrkTTxQCqn1P0DY3JQqyB6XTRKYilFjaqQwo621bTF i9fImgJfuk9fKM0XgOh4wcFHu+lw0CIHr1WSoxYSIn/4CAGRaWbvbwFax7Nyw5FktTzV d0ymbxS12uVtXz/GkucmZcu+cXYXFoHn3rltSLV9CrDgdrKwaqRXEXqgWpQfQVcLeY/w BP5argOsYhjF1cmS0mkvss4bBsfC0AKUjc68EehDlfDbarS7KHTjt5gyqN1HTdPB9TR0 UQUd+fdpbUoEj+dQB2ZfSLb0kw3LenLRzV7Zdb5iN3eIBnqq/9r9CLYLYm6+JkFFPGCc 8Qeg== X-Gm-Message-State: AElRT7GPFljoUc+NaHaJOyVCccmR/WMnD++j7aQtbxXOD4O61sQtbrd2 Xnor5Jr77yxikwwB8bLckt/R8p0W X-Google-Smtp-Source: AG47ELt+mrwj/vjOsZjhPu8l2u4VwGEh0BI9fxen0BkPkdmLTvjBtxXObnInyRDPuUtEBW6hpLkggw== X-Received: by 10.223.139.130 with SMTP id o2mr4900073wra.147.1521296655083; Sat, 17 Mar 2018 07:24:15 -0700 (PDT) From: Radostin Stoyanov To: libvir-list@redhat.com Date: Sat, 17 Mar 2018 14:23:40 +0000 Message-Id: <20180317142340.11653-23-rstoyanov1@gmail.com> In-Reply-To: <20180317142340.11653-1-rstoyanov1@gmail.com> References: <20180317142340.11653-1-rstoyanov1@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Sat, 17 Mar 2018 14:24:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Sat, 17 Mar 2018 14:24:16 +0000 (UTC) for IP:'209.85.128.193' DOMAIN:'mail-wr0-f193.google.com' HELO:'mail-wr0-f193.google.com' FROM:'rstoyanov1@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.139 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.128.193 mail-wr0-f193.google.com 209.85.128.193 mail-wr0-f193.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Radostin Stoyanov Subject: [libvirt] [PATCH 22/22] apibuild: Simplify parsing string tokens X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sat, 17 Mar 2018 14:28:24 +0000 (UTC) X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Improve readability and reduce the complexity of the code that is searching for string tokens (i.e. characters surrounded by a single or double quote). Signed-off-by: Radostin Stoyanov Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/apibuild.py | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 24e0eb505..f2971db5b 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -484,28 +484,16 @@ class CLexer: break l =3D len(line) if line[0] =3D=3D '"' or line[0] =3D=3D "'": - end =3D line[0] - line =3D line[1:] - found =3D 0 - tok =3D "" - while found =3D=3D 0: - i =3D 0 - l =3D len(line) - while i < l: - if line[i] =3D=3D end: - self.line =3D line[i+1:] - line =3D line[:i] - l =3D i - found =3D 1 - break - if line[i] =3D=3D '\\': - i =3D i + 1 - i =3D i + 1 - tok =3D tok + line - if found =3D=3D 0: - line =3D self.getline() - if line is None: - return None + quote =3D line[0] + i =3D 1 + while quote not in line[i:]: + i =3D len(line) + nextline =3D self.getline() + if nextline is None: + return None + line +=3D nextline + + tok, self.line =3D line[1:].split(quote, 1) self.last =3D ('string', tok) return self.last =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list