From patchwork Thu Apr 27 22:06:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 49604 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 EF3FC27BBEA; Thu, 27 Apr 2023 23:08:22 +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 18BE927BBE2 for ; Thu, 27 Apr 2023 23:08:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps9mY-0005Le-9i; Thu, 27 Apr 2023 18:08:06 -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 1ps9mV-0005Kd-IW for guix-patches@gnu.org; Thu, 27 Apr 2023 18:08:03 -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 1ps9mU-0007Hk-Ff for guix-patches@gnu.org; Thu, 27 Apr 2023 18:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps9mU-0000ka-40 for guix-patches@gnu.org; Thu, 27 Apr 2023 18:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63135] [PATCH 1/3] records: match-record: Raise a syntax error if TYPE is nonexistent. References: <20230427220452.4972-1-paren@disroot.org> In-Reply-To: <20230427220452.4972-1-paren@disroot.org> Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 22:08:02 +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.16826332232791 (code B ref 63135); Thu, 27 Apr 2023 22:08:02 +0000 Received: (at 63135) by debbugs.gnu.org; 27 Apr 2023 22:07:03 +0000 Received: from localhost ([127.0.0.1]:59971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps9lW-0000iq-Jc for submit@debbugs.gnu.org; Thu, 27 Apr 2023 18:07:03 -0400 Received: from knopi.disroot.org ([178.21.23.139]:53500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps9lV-0000iO-BG for 63135@debbugs.gnu.org; Thu, 27 Apr 2023 18:07:01 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2B1AC401FC; Fri, 28 Apr 2023 00:07:00 +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 QMpgJ3mA1ZBP; Fri, 28 Apr 2023 00:06:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1682633218; bh=GPhznM6wNK5AMuy0Nb33NHq6jGF40qkOAqXeIPrXDZY=; h=From:To:Cc:Subject:Date; b=fSGYPvir7OlnsiG/7szDpE8QUjGFzce5vuywAjVzRo0Z4NZoQDW9ijtimJ4fiSZRz v3AyPKOpaFcJu0k/YVUrhWtqGxMvzhm9HMxMtnFnvVpamsLFHvFf8gJZQKnqvqk470 Au/AhBBpw3d0iS1ekBu1Xd7nP/ZprNxmqtUa3UlUmsCBRgMMnOezBG0qw3NgofyyBm nm0MJ0Q9NFVgC2IL/Mb7USRfvd0VCIPB3nRRJkUzPeI1O51l2mPB4ZgkQIR5SaHYrL daKqsw0qHf6PO8kzHTVuahEXubwJT4kBxiUXyu7NaeyU9G+mQDy7KQhdwJEEBzTRPE tVvlN2L8j7rmg== Date: Thu, 27 Apr 2023 23:06:51 +0100 Message-Id: <20230427220653.5228-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): Raise a human-compherensible syntax error if the given record type identifier is unbound. Co-authored-by: Josselin Poiret --- guix/records.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) base-commit: d59b4764f3171b1430a6d3b954659b8aab730475 diff --git a/guix/records.scm b/guix/records.scm index 7d43b064d8..d8966998c1 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -105,7 +105,12 @@ (define (report-duplicate-field-specifier name ctor) (define-syntax map-fields (lambda (x) - (syntax-violation 'map-fields "bad use of syntactic keyword" x x))) + (syntax-case x () + ((_ type within) + (syntax-violation (syntax->datum #'within) + "undefined guix record-type" + #'type)) + (_ (syntax-violation 'map-fields "bad use of syntactic keyword" x x))))) (define-syntax-parameter this-record (lambda (s) @@ -459,7 +464,7 @@ (define-syntax type "This macro lets us query record type info at macro-expansion time." (syntax-case s (map-fields) - ((_ map-fields macro) + ((_ (map-fields _ _) macro) #'(macro (field ...))) (id (identifier? #'id) @@ -595,7 +600,7 @@ (define-syntax match-record-inner #'(let-syntax ((field-offset (syntax-rules () ((_ f) (lookup-field field 0 f))))) - (let* ((offset (type map-fields field-offset)) + (let* ((offset (type (map-fields type match-record) field-offset)) (variable (struct-ref record offset))) (match-record-inner record type (rest ...) body ...)))) ((_ record type (field rest ...) body ...) From patchwork Thu Apr 27 22:06:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 49605 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 352C627BBEA; Thu, 27 Apr 2023 23:08:34 +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 8490527BBE2 for ; Thu, 27 Apr 2023 23:08:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps9mX-0005Lc-VM; Thu, 27 Apr 2023 18:08:06 -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 1ps9mV-0005Kc-IM for guix-patches@gnu.org; Thu, 27 Apr 2023 18:08:03 -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 1ps9mU-0007Hl-MF for guix-patches@gnu.org; Thu, 27 Apr 2023 18:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps9mU-0000kh-FY for guix-patches@gnu.org; Thu, 27 Apr 2023 18:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63135] [PATCH 2/3] records: match-record: Display more helpful field-not-found error. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 22:08:02 +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.16826332272807 (code B ref 63135); Thu, 27 Apr 2023 22:08:02 +0000 Received: (at 63135) by debbugs.gnu.org; 27 Apr 2023 22:07:07 +0000 Received: from localhost ([127.0.0.1]:59974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps9la-0000jB-GR for submit@debbugs.gnu.org; Thu, 27 Apr 2023 18:07:06 -0400 Received: from knopi.disroot.org ([178.21.23.139]:53992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps9lW-0000ib-7p for 63135@debbugs.gnu.org; Thu, 27 Apr 2023 18:07:02 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BAD2140306; Fri, 28 Apr 2023 00:07:01 +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 QQQQQgHpRCy5; Fri, 28 Apr 2023 00:07:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1682633220; bh=aa/TNg6F4FuftaCqmdSb5c/md+/36DE3Ku+qtLN2znA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Lgv8AUJVz1WSThRrGfojcVQksNqw5AryDHhFDoewSIrgqEto5KDn2oZRbUwrWGvrG t81jgkcyMsitt/2LxC1eT2n+FTXUDKb9OqvUkd19HA21jmdEi2FIei12/PdAwC9C30 cRqLs/BfbOGrK6dXuVUbCf8OItdQvCth8+80P1WpTGdBqdAQ4gYAS79/hrW4EOjxKS nSVfNrG/uC95wDZIBSA1QRBKgJ84Wg+XAaRRN1QARaGjn6kyQjyV7n8DUhPjh6A1ss GZhUaKxrxRGnkriAlyMd+H35BXlT5UncxsmsNRAD1WAwdBiROD5Q5/1Czp8Cdnnpft yKuN5JFxEY5Tg== Date: Thu, 27 Apr 2023 23:06:52 +0100 Message-Id: <20230427220653.5228-2-paren@disroot.org> In-Reply-To: <20230427220653.5228-1-paren@disroot.org> References: <20230427220653.5228-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): Display MATCH-RECORD as the origin of "unknown record type field" errors. Show the original MATCH-RECORD form, rather than an intermediate LOOKUP-FIELD form, within said errors. --- guix/records.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/guix/records.scm b/guix/records.scm index d8966998c1..4bee9d0aac 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -582,44 +582,46 @@ (define-syntax lookup-field (lambda (s) "Look up FIELD in the given list and return an expression that represents its offset in the record. Raise a syntax violation when the field is not -found." +found, displaying it as originating in form S*." (syntax-case s () - ((_ field offset ()) - (syntax-violation 'lookup-field "unknown record type field" - s #'field)) - ((_ field offset (head tail ...)) + ((_ s* field offset ()) + (syntax-violation 'match-record + "unknown record type field" + #'s* #'field)) + ((_ s* field offset (head tail ...)) (free-identifier=? #'field #'head) #'offset) - ((_ field offset (_ tail ...)) - #'(lookup-field field (+ 1 offset) (tail ...)))))) + ((_ s* field offset (_ tail ...)) + #'(lookup-field s* field (+ 1 offset) (tail ...)))))) (define-syntax match-record-inner (lambda (s) (syntax-case s () - ((_ record type ((field variable) rest ...) body ...) + ((_ s* record type ((field variable) rest ...) body ...) #'(let-syntax ((field-offset (syntax-rules () ((_ f) - (lookup-field field 0 f))))) + (lookup-field s* field 0 f))))) (let* ((offset (type (map-fields type match-record) field-offset)) (variable (struct-ref record offset))) - (match-record-inner record type (rest ...) body ...)))) - ((_ record type (field rest ...) body ...) + (match-record-inner s* record type (rest ...) body ...)))) + ((_ s* record type (field rest ...) body ...) ;; Redirect to the canonical form above. - #'(match-record-inner record type ((field field) rest ...) body ...)) - ((_ record type () body ...) + #'(match-record-inner s* record type ((field field) rest ...) body ...)) + ((_ s* record type () body ...) #'(begin body ...))))) (define-syntax match-record - (syntax-rules () + (lambda (s) "Bind each FIELD of a RECORD of the given TYPE to it's FIELD name. The order in which fields appear does not matter. A syntax error is raised if an unknown field is queried. The current implementation does not support thunked and delayed fields." ;; TODO support thunked and delayed fields - ((_ record type (fields ...) body ...) - (if (eq? (struct-vtable record) type) - (match-record-inner record type (fields ...) body ...) - (throw 'wrong-type-arg record))))) + (syntax-case s () + ((_ record type (fields ...) body ...) + #`(if (eq? (struct-vtable record) type) + (match-record-inner #,s record type (fields ...) body ...) + (throw 'wrong-type-arg record)))))) ;;; records.scm ends here From patchwork Thu Apr 27 22:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 49603 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 702D027BBE2; Thu, 27 Apr 2023 23:08:21 +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=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 2F2E327BBE9 for ; Thu, 27 Apr 2023 23:08:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps9mX-0005LU-IY; Thu, 27 Apr 2023 18:08:05 -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 1ps9mV-0005Ke-Ib for guix-patches@gnu.org; Thu, 27 Apr 2023 18:08:03 -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 1ps9mV-0007Hn-5I for guix-patches@gnu.org; Thu, 27 Apr 2023 18:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps9mU-0000kp-Rw for guix-patches@gnu.org; Thu, 27 Apr 2023 18:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63135] [PATCH 3/3] records: match-record: Support thunked and delayed fields. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 22:08:02 +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.16826332272813 (code B ref 63135); Thu, 27 Apr 2023 22:08:02 +0000 Received: (at 63135) by debbugs.gnu.org; 27 Apr 2023 22:07:07 +0000 Received: from localhost ([127.0.0.1]:59976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps9la-0000jE-TJ for submit@debbugs.gnu.org; Thu, 27 Apr 2023 18:07:07 -0400 Received: from knopi.disroot.org ([178.21.23.139]:54110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps9lW-0000io-Li for 63135@debbugs.gnu.org; Thu, 27 Apr 2023 18:07:03 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 312BA402CF; Fri, 28 Apr 2023 00:07:02 +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 SE_5I9hBv7oA; Fri, 28 Apr 2023 00:07:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1682633220; bh=VR5KpZOjanz7iRoDHHzMvUH88/n7hp56BE3Gxtae7XM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SObSE/22RUtVIwrfNTmgO0VwNlfKsc8T0/w+1PcWwlpLvQbVKO0knl+Ugi83ymk43 QWBjr3JHiIuQ+jz+Luz1fNaXaLG74V7laZ+XOq5g2z1EeuBaGcXWfNz1ggAIk2q4Ey 9i+L/RRsL9SBglpAikckp9ykpmy2T48ta5IYsuecgAm4OjhA931xxMUg3iqKiNBD/y llm7g4+twSEilNNgM9uyX/4ttnT5JCcK6yuUv74T0mXNVdbuSzgjLxCwuAG9ZR8Vds sXbRx2SPVhi6iNkBkWzgUQWEW+YDBwIGYlRC7NPsh+Doshz4i5K1KleFmw7bVdYduu 908fbrmmjkPZw== Date: Thu, 27 Apr 2023 23:06:53 +0100 Message-Id: <20230427220653.5228-3-paren@disroot.org> In-Reply-To: <20230427220653.5228-1-paren@disroot.org> References: <20230427220653.5228-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): Unwrap matched thunked and delayed fields. * tests/records.scm ("match-record, thunked field", "match-record, delayed field"): New tests. --- guix/records.scm | 60 ++++++++++++++++++++++++++++++----------------- tests/records.scm | 29 +++++++++++++++++++++++ 2 files changed, 68 insertions(+), 21 deletions(-) diff --git a/guix/records.scm b/guix/records.scm index 4bee9d0aac..041eb2f297 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -21,6 +21,7 @@ (define-module (guix records) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-71) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) #:autoload (system base target) (target-most-positive-fixnum) @@ -428,10 +429,19 @@ (define (compute-abi-cookie field-specs) (defaults (filter-map field-default-value #'((field properties ...) ...))) (sanitizers (filter-map field-sanitizer - #'((field properties ...) ...))) + #'((field properties ...) ...))) (cookie (compute-abi-cookie field-spec))) (with-syntax (((field-spec* ...) (map field-spec->srfi-9 field-spec)) + ((field-type ...) + (map (match-lambda + ((? thunked-field?) + (datum->syntax s 'thunked)) + ((? delayed-field?) + (datum->syntax s 'delayed)) + (else + (datum->syntax s 'normal))) + field-spec)) ((thunked-field-accessor ...) (filter-map (lambda (field) (and (thunked-field? field) @@ -465,7 +475,7 @@ (define-syntax type macro-expansion time." (syntax-case s (map-fields) ((_ (map-fields _ _) macro) - #'(macro (field ...))) + #'(macro ((field field-type) ...))) (id (identifier? #'id) #'#,(rtd-identifier #'type))))) @@ -578,31 +588,42 @@ (define (recutils->alist port) ;;; Pattern matching. ;;; -(define-syntax lookup-field +(define-syntax lookup-field+wrapper (lambda (s) - "Look up FIELD in the given list and return an expression that represents -its offset in the record. Raise a syntax violation when the field is not -found, displaying it as originating in form S*." - (syntax-case s () - ((_ s* field offset ()) + "Look up FIELD in the given list and return both an expression that represents +its offset in the record and a procedure that wraps it to return its \"true\" value +(for instance, FORCE is returned in the case of a delayed field). RECORD is passed +to thunked values. Raise a syntax violation when the field is not found, displaying +it as originating in form S*." + (syntax-case s (normal delayed thunked) + ((_ s* record field offset ()) (syntax-violation 'match-record "unknown record type field" #'s* #'field)) - ((_ s* field offset (head tail ...)) + ((_ s* record field offset ((head normal) tail ...)) + (free-identifier=? #'field #'head) + #'(values offset identity)) + ((_ s* record field offset ((head delayed) tail ...)) (free-identifier=? #'field #'head) - #'offset) - ((_ s* field offset (_ tail ...)) - #'(lookup-field s* field (+ 1 offset) (tail ...)))))) + #'(values offset force)) + ((_ s* record field offset ((head thunked) tail ...)) + (free-identifier=? #'field #'head) + #'(values offset (cut <> record))) + ((_ s* record field offset (_ tail ...)) + #'(lookup-field+wrapper s* record field + (+ 1 offset) (tail ...)))))) (define-syntax match-record-inner (lambda (s) (syntax-case s () ((_ s* record type ((field variable) rest ...) body ...) - #'(let-syntax ((field-offset (syntax-rules () - ((_ f) - (lookup-field s* field 0 f))))) - (let* ((offset (type (map-fields type match-record) field-offset)) - (variable (struct-ref record offset))) + #'(let-syntax ((field-offset+wrapper + (syntax-rules () + ((_ f) + (lookup-field+wrapper s* record field 0 f))))) + (let* ((offset wrap (type (map-fields type match-record) + field-offset+wrapper)) + (variable (wrap (struct-ref record offset)))) (match-record-inner s* record type (rest ...) body ...)))) ((_ s* record type (field rest ...) body ...) ;; Redirect to the canonical form above. @@ -614,10 +635,7 @@ (define-syntax match-record (lambda (s) "Bind each FIELD of a RECORD of the given TYPE to it's FIELD name. The order in which fields appear does not matter. A syntax error is raised if -an unknown field is queried. - -The current implementation does not support thunked and delayed fields." - ;; TODO support thunked and delayed fields +an unknown field is queried." (syntax-case s () ((_ record type (fields ...) body ...) #`(if (eq? (struct-vtable record) type) diff --git a/tests/records.scm b/tests/records.scm index b1203dfeb7..4f0aeb3903 100644 --- a/tests/records.scm +++ b/tests/records.scm @@ -561,4 +561,33 @@ (define-record-type* foo make-foo (make-fresh-user-module))) (lambda (key . args) key))) +(test-equal "match-record, delayed field" + "foo bar bar foo" + (begin + (define-record-type* with-delayed make-with-delayed + with-delayed? + (delayed with-delayed-delayed + (delayed))) + + (let ((rec (with-delayed + (delayed "foo bar bar foo")))) + (match-record rec (delayed) + delayed)))) + +(test-equal "match-record, thunked field" + '("foo" "foobar") + (begin + (define-record-type* with-thunked make-with-thunked + with-thunked? + (normal with-thunked-normal) + (thunked with-thunked-thunked + (thunked))) + + (let ((rec (with-thunked + (normal "foo") + (thunked (string-append (with-thunked-normal this-record) + "bar"))))) + (match-record rec (normal thunked) + (list normal thunked))))) + (test-end)