From patchwork Fri Apr 28 19:19:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 49659 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 BFC5127BBEA; Fri, 28 Apr 2023 20:20:40 +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=-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 1824B27BBE2 for ; Fri, 28 Apr 2023 20:20:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psTda-0002Ra-TH; Fri, 28 Apr 2023 15:20:11 -0400 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 1psTdT-0002PN-Tx for guix-patches@gnu.org; Fri, 28 Apr 2023 15:20:05 -0400 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 1psTdT-0004JV-Di for guix-patches@gnu.org; Fri, 28 Apr 2023 15:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psTdT-00063Q-8h for guix-patches@gnu.org; Fri, 28 Apr 2023 15:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63135] [PATCH v2 5/5] records: Add MATCH-RECORD-LAMBDA. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 19:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63135 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63135@debbugs.gnu.org Cc: "\(" , Josselin Poiret Received: via spool by 63135-submit@debbugs.gnu.org id=B63135.168270956123138 (code B ref 63135); Fri, 28 Apr 2023 19:20:03 +0000 Received: (at 63135) by debbugs.gnu.org; 28 Apr 2023 19:19:21 +0000 Received: from localhost ([127.0.0.1]:34538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psTcm-000615-UH for submit@debbugs.gnu.org; Fri, 28 Apr 2023 15:19:21 -0400 Received: from knopi.disroot.org ([178.21.23.139]:41768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psTck-00060H-Us for 63135@debbugs.gnu.org; Fri, 28 Apr 2023 15:19:19 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 358B44021E; Fri, 28 Apr 2023 21:19:18 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PBCvUDFffq0U; Fri, 28 Apr 2023 21:19:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1682709556; bh=73P5wsZTJ6hDn+xXhAEBY6bfYosiRAiY3VVjTHHz1Kc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QEmJ9uKAGI2WWRhC/AzyLSwDXXpqjvEavfsvFFmtHoxmGC1PImlcalhxVI+rHY7K5 QqLGZ9g5XvN4rEEhhe+AKChydkBNT/+91maEKHCKuydP1jer7FJAyPJAcqPgcyXz+K m7ismylrMj5nei/N+0dAnOkI4IQsxKxpCR+4sCJL8ZsvjKH+cjWkyEIUNx792Knd4o pexECYPS257XJB1MVw2Ap+Gy8sRbtHZcS1bEKsM53bvOunjeWrbXhFrkujNTHpbJvf xYmktTxyDsY3Xf8ksJsXwCJLctJVDyiBlIxrYFtwmhVTNGCQjjV48nSqfa48VYMACB x6miogJY9AHgw== Date: Fri, 28 Apr 2023 20:19:05 +0100 Message-Id: <20230428191905.13860-6-paren@disroot.org> In-Reply-To: <20230428191905.13860-1-paren@disroot.org> References: <20230428191905.13860-1-paren@disroot.org> 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: , Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" 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 * guix/records.scm (match-record-lambda): New syntax. * tests/records.scm ("match-record-lambda"): New test. --- .dir-locals.el | 1 + guix/records.scm | 15 ++++++++++++++- tests/records.scm | 12 ++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.dir-locals.el b/.dir-locals.el index 3ffd25ee94..d79b5c9d7e 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -71,6 +71,7 @@ (eval . (put 'lambda* 'scheme-indent-function 1)) (eval . (put 'substitute* 'scheme-indent-function 1)) (eval . (put 'match-record 'scheme-indent-function 3)) + (eval . (put 'match-record-lambda 'scheme-indent-function 2)) ;; TODO: Contribute these to Emacs' scheme-mode. (eval . (put 'let-keywords 'scheme-indent-function 3)) diff --git a/guix/records.scm b/guix/records.scm index 041eb2f297..504a023e87 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -31,7 +31,8 @@ (define-module (guix records) alist->record object->fields recutils->alist - match-record)) + match-record + match-record-lambda)) ;;; Commentary: ;;; @@ -642,4 +643,16 @@ (define-syntax match-record (match-record-inner #,s record type (fields ...) body ...) (throw 'wrong-type-arg record)))))) +(define-syntax match-record-lambda + (lambda (s) + "Return a procedure accepting a single record of the given TYPE for which each +FIELD will be bound to its FIELD name within the returned procedure. A syntax error +is raised if an unknown field is queried." + (syntax-case s () + ((_ type (field ...) body ...) + #`(lambda (record) + (if (eq? (struct-vtable record) type) + (match-record-inner #,s record type (field ...) body ...) + (throw 'wrong-type-arg record))))))) + ;;; records.scm ends here diff --git a/tests/records.scm b/tests/records.scm index 4f0aeb3903..8ee306bddc 100644 --- a/tests/records.scm +++ b/tests/records.scm @@ -590,4 +590,16 @@ (define-record-type* with-thunked make-with-thunked (match-record rec (normal thunked) (list normal thunked))))) +(test-equal "match-record-lambda" + '("thing: foo" "thing: bar") + (begin + (define-record-type* with-text make-with-text + with-text? + (text with-text-text)) + + (map (match-record-lambda (text) + (string-append "thing: " text)) + (list (with-text (text "foo")) + (with-text (text "bar")))))) + (test-end)