From patchwork Sat Nov 19 22:23:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 1103 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7BA2727BBED; Sat, 19 Nov 2022 22:24:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9799B27BBE9 for ; Sat, 19 Nov 2022 22:24:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owWFo-0006Yq-Uc; Sat, 19 Nov 2022 17:24:04 -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 1owWFn-0006YL-PW for guix-patches@gnu.org; Sat, 19 Nov 2022 17:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owWFn-00042D-45 for guix-patches@gnu.org; Sat, 19 Nov 2022 17:24:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owWFm-0004bW-HV for guix-patches@gnu.org; Sat, 19 Nov 2022 17:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59390] [PATCH 0/5] Doing 'match-record' work at expansion time Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Nov 2022 22:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59390@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166889662717672 (code B ref -1); Sat, 19 Nov 2022 22:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2022 22:23:47 +0000 Received: from localhost ([127.0.0.1]:41569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owWFW-0004ay-Ji for submit@debbugs.gnu.org; Sat, 19 Nov 2022 17:23:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:55064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owWFR-0004am-C1 for submit@debbugs.gnu.org; Sat, 19 Nov 2022 17:23:45 -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 1owWFR-0006Ke-6E for guix-patches@gnu.org; Sat, 19 Nov 2022 17:23:41 -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 1owWFP-00040L-W2; Sat, 19 Nov 2022 17:23:40 -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:Subject:To:From:in-reply-to: references; bh=MoPf4ITetA2QdntnwKLEL/zk389YW0tIz4U0JmVwxlU=; b=nSNrRzh0BtGY2b 7DChT6t0hLWfLwRM6jnLB3pjHnM959S/zaUfby6TmH0Bd8hoJdunbS9/FZc7zfrLw2z3Z5cFj0Kzv XKI747ouNApGdkS+BbpmknTK+nBhZjrFXcdrM3NrUVkNKCkiyPo0QFj98HJjZLVaN8edQP3MkRx0e NZKOU0NbH/qhgb5cCM4P9W3RRAlgbS0i5zvMiugfUCKRXE4Ysn9sZ1MB4BCARm2ngcyymNfEzkaEi bVkegZBg3MCJuewj6G5j4NxRLIT6yeX9TyE1lCMacmyvj3OytZP7nT/r57gdNpRET1ZYD2pnsAFRq i7+3BxqLiwLMgOpgM/aw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owWFP-0006Ep-DU; Sat, 19 Nov 2022 17:23:39 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 19 Nov 2022 23:23:26 +0100 Message-Id: <20221119222326.10644-1-ludo@gnu.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello Guix! This addresses a longstanding issue: making ‘match-record’ efficient, and allowing it to error out on unknown field names are macro-expansion time. It does so by changing the record type identifier passed to ‘define-record-type*’ to a macro that can either expand to the actual record type descriptor (RTD) or provide the list of fields of this type: --8<---------------cut here---------------start------------->8--- scheme@(guix records)> (define-record-type* foo make-foo foo? (one foo-one) (two foo-two)) scheme@(guix records)> $89 = #> scheme@(guix records)> ,expand $90 = #{% rtd}# scheme@(guix records)> ,expand ( map-fields f) $91 = (f (one two)) scheme@(guix records)> ,optimize (match-record x (two one) (list one two)) $92 = (if (eq? (struct-vtable x) #{% rtd}#) (let* ((two (struct-ref x 1)) (one (struct-ref x 0))) (list one two)) (throw 'wrong-type-arg x)) scheme@(guix records)> ,expand (match-record x (xyz) #f) While executing meta-command: Syntax error: unknown file:12066:34: lookup-field: unknown record type field in subform xyz of (lookup-field xyz (+ 1 (+ 1 0)) ()) --8<---------------cut here---------------end--------------->8--- I changed a few services that were using ‘match’ to use either ‘match-record’ or accessors (the latter when accessing just one or two fields). This change breaks the ABI: we’ll have to run: make clean-go && make Thoughts? Ludo’. Ludovic Courtès (5): records: 'match-record' checks fields at macro-expansion time. doc: Recommend 'match-record'. home: services: Use 'match-record' instead of 'match'. services: base: Use 'match-record' instead of 'match'. services: networking: Avoid 'match' on records. doc/contributing.texi | 7 +- gnu/home/services/mcron.scm | 58 +-- gnu/home/services/shells.scm | 50 +- gnu/home/services/xdg.scm | 36 +- gnu/services/base.scm | 882 +++++++++++++++++------------------ gnu/services/cuirass.scm | 4 +- gnu/services/getmail.scm | 22 +- gnu/services/networking.scm | 661 +++++++++++++------------- guix/records.scm | 87 +++- tests/records.scm | 33 ++ 10 files changed, 967 insertions(+), 873 deletions(-) base-commit: bb04b5e0ceb606c8d33d53bf06f7fc8855a2c56b