From unknown Sat Aug 16 14:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74993] [PATCH] guix: toml: Fix evaluation of empty inline tables. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2024 11:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74993 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74993@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173469419212509 (code B ref -1); Fri, 20 Dec 2024 11:30:03 +0000 Received: (at submit) by debbugs.gnu.org; 20 Dec 2024 11:29:52 +0000 Received: from localhost ([127.0.0.1]:41872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tObCZ-0003Fh-SW for submit@debbugs.gnu.org; Fri, 20 Dec 2024 06:29:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:35930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tObCU-0003FU-IC for submit@debbugs.gnu.org; Fri, 20 Dec 2024 06:29:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tObCT-0005qE-V8 for guix-patches@gnu.org; Fri, 20 Dec 2024 06:29:46 -0500 Received: from mout-p-202.mailbox.org ([2001:67c:2050:0:465::202]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1tObCS-00031e-5J for guix-patches@gnu.org; Fri, 20 Dec 2024 06:29:45 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4YF4vL2kVlz9t7b for ; Fri, 20 Dec 2024 12:29:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1734694174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=DvakTHMVkHDdZA0ezy+GELedGZnGeTV4NB6GKKeFuTk=; b=iLghc8Cv7iFEDL9Q79EOPwydoPXajBA3FUMtagVuwQ32VdyLvfznBDCgjXeFstaECZEr6U rPySP5fetsvW5GpzEdG8al9pNUF6ykE9+bxp5V3AbWUzBtuwbdk1uETa1T2vQeB5IptwTF /hk31hGDfMwYj+GIgO7V30o2Tk793ZmCTig1xtmFD2bXoHf2mOSipq6AnyQ6N7EVKAKaqH hcUpjfVVD4WGEaz9ZP5p0UrTTMk4vlbXwZio87f9VZngeq7aJkU3mgNjhSrbMhxI6upN1m H+LoZYaa4wLRqbXnPMym8EpQtvrnME6x/i1vdyUfjofdYdHCMhzhf4ZSvy57Dw== Date: Fri, 20 Dec 2024 12:29:32 +0100 From: Lars-Dominik Braun Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Queue-Id: 4YF4vL2kVlz9t7b Received-SPF: pass client-ip=2001:67c:2050:0:465::202; envelope-from=lars@6xq.net; helo=mout-p-202.mailbox.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * guix/build/toml.scm (eval-toml-file): Add pattern for empty inline table. * tests/toml.scm ("parse-toml: Empty inline table"): New testcase. Change-Id: I69663af2a861716acfb801fad4474e029e102a1b --- guix/build/toml.scm | 1 + tests/toml.scm | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/guix/build/toml.scm b/guix/build/toml.scm index 81b54fa5b7..a9be0887e7 100644 --- a/guix/build/toml.scm +++ b/guix/build/toml.scm @@ -414,6 +414,7 @@ (define (eval-toml-file parse-tree) local-time) tails))) ('array (list)) + ('inline-table '()) (('inline-table tails ...) (eval (keyword-flatten '(keyval) tails) '() '())))) diff --git a/tests/toml.scm b/tests/toml.scm index cd8e4d2338..64bc667f0c 100644 --- a/tests/toml.scm +++ b/tests/toml.scm @@ -396,6 +396,14 @@ (define-module (test-toml) point = { x = 1, y = 2 } animal = { type.name = \"pug\" }")) +(test-equal "parse-toml: Empty inline table" + '(("name") + ("point") + ("animal")) + (parse-toml "name = {} +point = { } +animal = { }")) + (test-error "parse-toml: Invalid assignment to inline table" #t (parse-toml "[product] base-commit: 946e48d1d87ec451e7a6315712f2e86c79961a51 -- 2.45.2 From unknown Sat Aug 16 14:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74993] [PATCH] guix: toml: Fix evaluation of empty inline tables. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Dec 2024 22:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74993 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Lars-Dominik Braun Cc: 74993@debbugs.gnu.org Received: via spool by 74993-submit@debbugs.gnu.org id=B74993.173516590617842 (code B ref 74993); Wed, 25 Dec 2024 22:32:02 +0000 Received: (at 74993) by debbugs.gnu.org; 25 Dec 2024 22:31:46 +0000 Received: from localhost ([127.0.0.1]:39285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQZur-0004dh-LH for submit@debbugs.gnu.org; Wed, 25 Dec 2024 17:31:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQZup-0004dN-DB for 74993@debbugs.gnu.org; Wed, 25 Dec 2024 17:31:44 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tQZuj-0001DM-2M; Wed, 25 Dec 2024 17:31:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=lN4+C5p6+mcDw8YX0o6y38L4xGlSyU+8IFcPhp/ebcQ=; b=fE9Of+szzZSVRwHCHc7H okmGBHCEBX/RCNA4zXyNlH9g+USdWFE8aEb4WtBc7zJBOLZBPW6xzgt+FUY6rVJkM49Lj4Rcv/vMM A3DwwU66ErkvFlDzCoPMXD+ouPY+3wSZd6UH6PyXq4INBNOfjCe5gxR9g9THJk7hO7poDs7G9IXqd u7ajseq6EfTJmQFvRAZ/KoAHV2g6Rkz4SQbkp3RfqlHZmHbAfA6Rtbs9Q4hlR8O656kxRwTE5q1dn U62pcxA605mlM4pl5yEdXUkg/Ln80wCB/I3lel25g4Eg9G2P9zqG7CDHkeqCIlKWwnlgYNVEV4wTk tEsTMQPb4b8xqA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Lars-Dominik Braun's message of "Fri, 20 Dec 2024 12:29:32 +0100") References: Date: Wed, 25 Dec 2024 23:31:35 +0100 Message-ID: <87a5cj2y48.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Lars-Dominik Braun skribis: > * guix/build/toml.scm (eval-toml-file): Add pattern for empty inline table. > * tests/toml.scm ("parse-toml: Empty inline table"): New testcase. > > Change-Id: I69663af2a861716acfb801fad4474e029e102a1b LGTM! From unknown Sat Aug 16 14:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74993] [PATCH] guix: toml: Fix evaluation of empty inline tables. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Dec 2024 21:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74993 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74993@debbugs.gnu.org Received: via spool by 74993-submit@debbugs.gnu.org id=B74993.17352476648942 (code B ref 74993); Thu, 26 Dec 2024 21:15:03 +0000 Received: (at 74993) by debbugs.gnu.org; 26 Dec 2024 21:14:24 +0000 Received: from localhost ([127.0.0.1]:42441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQvBP-0002Jz-QD for submit@debbugs.gnu.org; Thu, 26 Dec 2024 16:14:24 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:39066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQvBN-0002Jd-F7 for 74993@debbugs.gnu.org; Thu, 26 Dec 2024 16:14:14 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4YK1b21gKxz9sbn; Thu, 26 Dec 2024 22:14:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1735247646; 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=tOuP20sJvHDo/ADqJqvEczIWYKwKd6z+cGmf6z08bFU=; b=KNiQiLn2UR3S5UwstST9kqd6dZGQm+i98em2p6PUzJrnqIVZUBn1COAEkz4GlRc1GxQlw2 NiyllDXXETSurR2OOJQoYxTOlppkQYri/6ZaZijs/hs6Peu8NkqC4JH9zQRMtBhNYVvwOF 5Hl5UrlZDQlf+lfs3mw65Ua6xJhP94ddZwzA+vj8l+qHr28FpeuzEoNP9xoXG/I6WEhLlB VDbRjiLu+qJzk9KuckmmSK8JALmKdNLbJ6nw9+sU/saIrPyu6g5KNB4ubxKAaYvNVlvyAy SaLd75aW63YsGLrngQW2kbDi1T3vQZTdsXfpoSC+fiabeLW77AY3cyNZzJSN5Q== Date: Thu, 26 Dec 2024 22:14:03 +0100 From: Lars-Dominik Braun Message-ID: References: <87a5cj2y48.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87a5cj2y48.fsf@gnu.org> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, > LGTM! thanks. Since pyproject-build-system depends on (guix build toml) this is a world-rebuilding change. Can we piggyback this patch onto another (possibly unrelated) world-rebuilding branch? Lars From unknown Sat Aug 16 14:25:43 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74993] [PATCH] guix: toml: Fix evaluation of empty inline tables. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 17:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74993 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Lars-Dominik Braun Cc: 74993@debbugs.gnu.org Received: via spool by 74993-submit@debbugs.gnu.org id=B74993.173540670031428 (code B ref 74993); Sat, 28 Dec 2024 17:25:01 +0000 Received: (at 74993) by debbugs.gnu.org; 28 Dec 2024 17:25:00 +0000 Received: from localhost ([127.0.0.1]:52490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRaYe-0008Aq-CA for submit@debbugs.gnu.org; Sat, 28 Dec 2024 12:25:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRaYc-0008AZ-4p for 74993@debbugs.gnu.org; Sat, 28 Dec 2024 12:24:58 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tRaYW-0005gr-A8; Sat, 28 Dec 2024 12:24:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Ug3hxuWVfd5SDJ9eRkoNUTAYeBN7gP2tT7gyzWrzpjQ=; b=WrFpo4fstv1BsijSSz11 P9rRc0d6gOQ0aDlY0Gd30qr0XI6pypoZxT47InscdPLw5CyG2VyfhJMNI42IQi7t6T1YOLhyHf1Vb jjMcTL+CMG/asDuO8we3yfYrpBNS9veecEZWjllXZFMsHO9DUao2Pewd37y18AnVzIwDqgZx024Bm i//UTDWranVBc9FVJm9QQ5yYXr9LdY7jkIzNmTgsMD7hF7pqIDtxlUsgrBjLrRGSsgtCy5HnaiZlB AOwrdqxuAYt0+eGNqakJnbtBqXZFxQpAEiLUphu3e3mGUs/Xm2KfLw80t6TNhN6xPxzb68v+rPRrw KAADbRX2ZWZPQw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Lars-Dominik Braun's message of "Thu, 26 Dec 2024 22:14:03 +0100") References: <87a5cj2y48.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Octidi 8 =?UTF-8?Q?Niv=C3=B4se?= an 233 de la =?UTF-8?Q?R=C3=A9volution,?= jour du Fumier X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 28 Dec 2024 18:24:48 +0100 Message-ID: <87ldvzvhy7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Lars-Dominik Braun skribis: >> LGTM! > > thanks. Since pyproject-build-system depends on (guix build toml) this > is a world-rebuilding change. Can we piggyback this patch onto another > (possibly unrelated) world-rebuilding branch? Oh, good point. I guess this can go to the =E2=80=98python-team=E2=80=99 b= ranch? Ludo=E2=80=99. From unknown Sat Aug 16 14:25:43 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Lars-Dominik Braun Subject: bug#74993: closed ([PATCH] guix: toml: Fix evaluation of empty inline tables.) Message-ID: References: <874j2d5smw.fsf@elephly.net> X-Gnu-PR-Message: they-closed 74993 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74993@debbugs.gnu.org Date: Sun, 05 Jan 2025 12:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1736081642-4542-1" This is a multi-part message in MIME format... ------------=_1736081642-4542-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74993: [PATCH] guix: toml: Fix evaluation of empty inline tables. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 74993@debbugs.gnu.org. --=20 74993: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74993 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1736081642-4542-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74993-done) by debbugs.gnu.org; 5 Jan 2025 12:53:41 +0000 Received: from localhost ([127.0.0.1]:60307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUQ8S-0001AW-Qh for submit@debbugs.gnu.org; Sun, 05 Jan 2025 07:53:41 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21191) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUQ8O-0001AH-Le for 74993-done@debbugs.gnu.org; Sun, 05 Jan 2025 07:53:39 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1736081612; cv=none; d=zohomail.com; s=zohoarc; b=cBRxNLnpgpZx4U98ps2kcWijsTtOd3SLoVOX84KVMoZJiJjKnTgYdzY1TRkAod6nWaGJMCyxkJMIviTh3kB6t3q+Q8UaIsB4rzE+tdgfV3dAvi749peD23qQraGpqsdKyQqCnD10vuNoOHEnmISrTJa8v1g1xldHP0Ep/bsHDe4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1736081612; h=Content-Type:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=pXmrt5lC3IWFvoDObKKL4jejkPpIuXsCBldMN64eQ9U=; b=DUCi6kmEZdDf6T5Z+9K+kU9539ut/AIXAFGs8ygwCSsCSt4qRN8M2tx6uvowFuFnOpjahZqwBxBFvlEurtssyumwTSZrZzE2KeKSxD9wKXw887a6LBz8B+B2GPm1i4ZSBs9UN/Td0MkGFg+hZ9PORSmVjeDM91HG17Z9X3R1otc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1736081612; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Message-Id:Reply-To; bh=pXmrt5lC3IWFvoDObKKL4jejkPpIuXsCBldMN64eQ9U=; b=PTiNEzDygdSL7SWfx/AtTQEh/9BXYUKKvK+VGVQUZ4+UGqGuwy+CFaizeUhnv7oQ Gb1OaIp/xWQLwyKnnSHTCPKhZNHdXWZw4nf/bJy2pq20cyXZRI0+HJ3htOjuhAiz7Ag gYg3P9u0eujbTDyu9BM5COSrbBrtK/2d97tprpu4= Received: by mx.zohomail.com with SMTPS id 1736081610443634.1250545940134; Sun, 5 Jan 2025 04:53:30 -0800 (PST) From: Ricardo Wurmus To: 74993-done@debbugs.gnu.org Subject: [PATCH] guix: toml: Fix evaluation of empty inline tables. User-Agent: mu4e 1.12.7; emacs 29.4 Date: Sun, 05 Jan 2025 13:53:27 +0100 Message-ID: <874j2d5smw.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74993-done Cc: Lars-Dominik Braun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I've just pushed it to the python-team branch. -- Ricardo ------------=_1736081642-4542-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 Dec 2024 11:29:52 +0000 Received: from localhost ([127.0.0.1]:41872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tObCZ-0003Fh-SW for submit@debbugs.gnu.org; Fri, 20 Dec 2024 06:29:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:35930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tObCU-0003FU-IC for submit@debbugs.gnu.org; Fri, 20 Dec 2024 06:29:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tObCT-0005qE-V8 for guix-patches@gnu.org; Fri, 20 Dec 2024 06:29:46 -0500 Received: from mout-p-202.mailbox.org ([2001:67c:2050:0:465::202]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1tObCS-00031e-5J for guix-patches@gnu.org; Fri, 20 Dec 2024 06:29:45 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4YF4vL2kVlz9t7b for ; Fri, 20 Dec 2024 12:29:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1734694174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=DvakTHMVkHDdZA0ezy+GELedGZnGeTV4NB6GKKeFuTk=; b=iLghc8Cv7iFEDL9Q79EOPwydoPXajBA3FUMtagVuwQ32VdyLvfznBDCgjXeFstaECZEr6U rPySP5fetsvW5GpzEdG8al9pNUF6ykE9+bxp5V3AbWUzBtuwbdk1uETa1T2vQeB5IptwTF /hk31hGDfMwYj+GIgO7V30o2Tk793ZmCTig1xtmFD2bXoHf2mOSipq6AnyQ6N7EVKAKaqH hcUpjfVVD4WGEaz9ZP5p0UrTTMk4vlbXwZio87f9VZngeq7aJkU3mgNjhSrbMhxI6upN1m H+LoZYaa4wLRqbXnPMym8EpQtvrnME6x/i1vdyUfjofdYdHCMhzhf4ZSvy57Dw== Date: Fri, 20 Dec 2024 12:29:32 +0100 From: Lars-Dominik Braun To: guix-patches@gnu.org Subject: [PATCH] guix: toml: Fix evaluation of empty inline tables. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Queue-Id: 4YF4vL2kVlz9t7b Received-SPF: pass client-ip=2001:67c:2050:0:465::202; envelope-from=lars@6xq.net; helo=mout-p-202.mailbox.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * guix/build/toml.scm (eval-toml-file): Add pattern for empty inline table. * tests/toml.scm ("parse-toml: Empty inline table"): New testcase. Change-Id: I69663af2a861716acfb801fad4474e029e102a1b --- guix/build/toml.scm | 1 + tests/toml.scm | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/guix/build/toml.scm b/guix/build/toml.scm index 81b54fa5b7..a9be0887e7 100644 --- a/guix/build/toml.scm +++ b/guix/build/toml.scm @@ -414,6 +414,7 @@ (define (eval-toml-file parse-tree) local-time) tails))) ('array (list)) + ('inline-table '()) (('inline-table tails ...) (eval (keyword-flatten '(keyval) tails) '() '())))) diff --git a/tests/toml.scm b/tests/toml.scm index cd8e4d2338..64bc667f0c 100644 --- a/tests/toml.scm +++ b/tests/toml.scm @@ -396,6 +396,14 @@ (define-module (test-toml) point = { x = 1, y = 2 } animal = { type.name = \"pug\" }")) +(test-equal "parse-toml: Empty inline table" + '(("name") + ("point") + ("animal")) + (parse-toml "name = {} +point = { } +animal = { }")) + (test-error "parse-toml: Invalid assignment to inline table" #t (parse-toml "[product] base-commit: 946e48d1d87ec451e7a6315712f2e86c79961a51 -- 2.45.2 ------------=_1736081642-4542-1--