From patchwork Thu Mar 31 12:52:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 38250 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 B63CB27BBEA; Thu, 31 Mar 2022 13:55:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable 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 8885C27BBE9 for ; Thu, 31 Mar 2022 13:55:11 +0100 (BST) Received: from localhost ([::1]:46380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZuKU-0006wJ-MX for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 08:55:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZuKN-0006w3-AS for guix-patches@gnu.org; Thu, 31 Mar 2022 08:55:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44344) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZuKM-0007J8-TO for guix-patches@gnu.org; Thu, 31 Mar 2022 08:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZuKM-0005DQ-Rx for guix-patches@gnu.org; Thu, 31 Mar 2022 08:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54652] [PATCH 2/2] guix: MATCH-RECORD supports (FIELD-NAME VARIABLE-NAME) forms. References: <20220331124657.2985-1-attila@lendvai.name> In-Reply-To: <20220331124657.2985-1-attila@lendvai.name> Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Mar 2022 12:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54652 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54652@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 54652-submit@debbugs.gnu.org id=B54652.164873128220013 (code B ref 54652); Thu, 31 Mar 2022 12:55:02 +0000 Received: (at 54652) by debbugs.gnu.org; 31 Mar 2022 12:54:42 +0000 Received: from localhost ([127.0.0.1]:38241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZuK2-0005Cj-Dg for submit@debbugs.gnu.org; Thu, 31 Mar 2022 08:54:42 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:38565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZuK0-0005CW-L3 for 54652@debbugs.gnu.org; Thu, 31 Mar 2022 08:54:41 -0400 Received: by mail-ej1-f53.google.com with SMTP id r13so47908021ejd.5 for <54652@debbugs.gnu.org>; Thu, 31 Mar 2022 05:54:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Mg1NnyEMbF0Qpd/WMY0lgAk90fwyWJ/nVdVU5N62754=; b=pIZTMS6VezqLN3cCsPHYH9+4z+0vLbjhnMr1kUuk/Jcaxwn2SEI1wgMkJOIzfBJ1xB u/9RUjk8jaApYxbrdP+mRf2Y4JILT0Iq3BUBRgatFh+ILQ4W44fugBKvyIA9XUiAbX03 zaL7viGP/ZyQIIokKWhZMSka1qiHH5848k73nBR63kPFSgDMdHb9bcQvIHZjpNP3kqDn MWgVTBuKU4czCQtvqWO3HhyzTCu90Wy2TpNXZLRTtvNyeMuuo9HSg0QCXK6Hsc8weHED AuCEYTdUJppM+tAvAtwtzpJps/p2+khsjr4zBVsLVe5bqIh/iLwx8EMoJTb8d1UMaE55 XqGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Mg1NnyEMbF0Qpd/WMY0lgAk90fwyWJ/nVdVU5N62754=; b=czkALxfpSPxm/RQHe9ZDx59/3EYWChCf4mSLO/L5oezp8NAkVq+sPpS3WesEFOofuT XFezjfHjQD0zKFUE5Pd1Kx2luz9g/Y2xKsPIQ3KH/wGzDiAOZjDpu4EGza8QigtDOQJU HwTMtA75A4qqm8/xEFpbT+tHjPvD11D6bWreD2xVDRf74wecuiBBklF1PKeM0pB1JJRe 29PbJhuPltkCit8oSZF0adBG1fbB7sdRgaPN5bllooSp9No6syjLxK+nU+NMITG1VbYI zZpWjY4YnzR0WNO46NdAm/XlWbjsds9PXhwa6sYHSeJZTRUAQcgfEKRhBSwmDA5wKD9x Rh1A== X-Gm-Message-State: AOAM533K2bbIAibymH6IzjC/OrxIF0BRgtF5IPfxzSUU83TwCQrdGCEa tQFcsGTmxrorD01SG4gEXKjT+c7kPOc= X-Google-Smtp-Source: ABdhPJy7Krvv9qVCj0nSg869lvmxrcOwMkVQ0/AlLIPj54oAkBKTwAb47vn1bDcqC7yyydQz9RWilA== X-Received: by 2002:a17:906:99c1:b0:6db:f0cf:e38c with SMTP id s1-20020a17090699c100b006dbf0cfe38cmr4819422ejn.692.1648731274550; Thu, 31 Mar 2022 05:54:34 -0700 (PDT) Received: from lelap.local (catv-89-132-245-188.catv.fixed.vodafone.hu. [89.132.245.188]) by smtp.gmail.com with ESMTPSA id bm23-20020a170906c05700b006d597fd51c6sm9581912ejb.145.2022.03.31.05.54.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 05:54:34 -0700 (PDT) From: Attila Lendvai Date: Thu, 31 Mar 2022 14:52:31 +0200 Message-Id: <20220331125230.4388-2-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 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" X-getmail-retrieved-from-mailbox: Patches E.g. (match-record obj (field1 (field2 var-name)) ...) * guix/records.scm (match-record/fields): Implement it. --- a real world example i was facing: a field name is the same as an object constructor, and thus shadows it in a match-record form, unless a different variable name is chosen. guix/records.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/records.scm b/guix/records.scm index e311086d73..492ab2aed6 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -537,12 +537,15 @@ (define (recutils->alist port) (define-syntax match-record/fields (syntax-rules () - ((_ record type (field fields ...) body ...) - (let ((field ((record-accessor type 'field) record))) + ((_ record type ((field-name variable-name) fields ...) body ...) + (let ((variable-name ((record-accessor type 'field-name) record))) ;; TODO compute indices and report wrong-field-name errors at ;; expansion time ;; TODO support thunked and delayed fields (match-record/fields record type (fields ...) body ...))) + ((_ record type (field fields ...) body ...) + ;; Channel it back into the canonical form above. + (match-record/fields record type ((field field) fields ...) body ...)) ((_ record type () body ...) (begin body ...))))