[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/11: json: Re-export 'define-json-mapping' from (json) when available.
From: |
guix-commits |
Subject: |
10/11: json: Re-export 'define-json-mapping' from (json) when available. |
Date: |
Mon, 20 Jul 2020 17:26:13 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 4071879c86d059ee087c8986915ea72b8c742b72
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jul 20 23:19:37 2020 +0200
json: Re-export 'define-json-mapping' from (json) when available.
This prepares for the migration to Guile-JSON 4.3.0.
* guix/json.scm (define-as-needed): New macro.
(define-json-mapping): Use 'define-as-needed' instead of
'define-syntax-rule'.
---
guix/json.scm | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/guix/json.scm b/guix/json.scm
index 20f0bd8..3e3a28b 100644
--- a/guix/json.scm
+++ b/guix/json.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -18,15 +18,33 @@
(define-module (guix json)
#:use-module (json)
- #:use-module (srfi srfi-9)
- #:export (define-json-mapping))
+ #:use-module (srfi srfi-9))
;;; Commentary:
;;;
;;; Helpers to map JSON objects to SRFI-9 records. Taken from (guix swh).
+;;; This module is superseded by 'define-json-mapping' as found since version
+;;; 4.2.0 of Guile-JSON and will be removed once migration is complete.
;;;
;;; Code:
+(define-syntax define-as-needed
+ (lambda (s)
+ "Define the given syntax rule unless (json) already provides it."
+ (syntax-case s ()
+ ((_ (macro args ...) body ...)
+ (if (module-defined? (resolve-interface '(json))
+ (syntax->datum #'macro))
+ #'(eval-when (expand load eval)
+ ;; Re-export MACRO from (json).
+ (module-re-export! (current-module) '(macro)))
+ #'(begin
+ ;; Using Guile-JSON < 4.2.0, so provide our own MACRO.
+ (define-syntax-rule (macro args ...)
+ body ...)
+ (eval-when (expand load eval)
+ (module-export! (current-module) '(macro)))))))))
+
(define-syntax-rule (define-json-reader json->record ctor spec ...)
"Define JSON->RECORD as a procedure that converts a JSON representation,
read from a port, string, or hash table, into a record created by CTOR and
@@ -48,8 +66,11 @@ following SPEC, a series of field specifications."
(symbol->string 'field))))))
(ctor (extract-field table spec) ...)))))
-(define-syntax-rule (define-json-mapping rtd ctor pred json->record
- (field getter spec ...) ...)
+;; For some reason we cannot just have colliding definitions of
+;; 'define-json-mapping' (that leads to a build failure in users of this
+;; module), hence the use of 'define-as-needed'.
+(define-as-needed (define-json-mapping rtd ctor pred json->record
+ (field getter spec ...) ...)
"Define RTD as a record type with the given FIELDs and GETTERs, à la SRFI-9,
and define JSON->RECORD as a conversion from JSON to a record of this type."
(begin
- branch master updated (4874cae -> 64066ab), guix-commits, 2020/07/20
- 07/11: download: Add Savannah mirror., guix-commits, 2020/07/20
- 10/11: json: Re-export 'define-json-mapping' from (json) when available.,
guix-commits <=
- 09/11: gnu-maintenance: 'kernel.org' and 'savannah' updaters rewrite URLs., guix-commits, 2020/07/20
- 01/11: gnu: guile-ssh: Update to 0.13.0., guix-commits, 2020/07/20
- 11/11: gnu: python-aionotify: Fix test cases with Python 3.8., guix-commits, 2020/07/20
- 03/11: pack: 'self-contained-tarball' runs derivation in a UTF-8local., guix-commits, 2020/07/20
- 02/11: ssh: Speed up RPCs by using #:nodelay., guix-commits, 2020/07/20
- 05/11: gnu-maintenance: 'latest-html-release' honors #:file->signature., guix-commits, 2020/07/20
- 04/11: pack: Build the store database under a UTF-8 locale., guix-commits, 2020/07/20
- 06/11: gnu-maintenance: Add 'savannah' updater., guix-commits, 2020/07/20
- 08/11: upstream: Use 'warning' instead of 'format'., guix-commits, 2020/07/20