From 79b390a207adc70a1169c80e52c590d8b358f488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 1 Oct 2022 16:49:17 +0200 Subject: [PATCH] licenses: Let 'license?' expand to #t in trivial cases. With this change, we have: > ,expand (license? gpl3+) $2 = #t > ,expand (license? something-else) $3 = (let ((obj something-else)) (and ((@@ (srfi srfi-9) struct?) obj) ((@@ (srfi srfi-9) eq?) ((@@ (srfi srfi-9) struct-vtable) obj) (@@ (guix licenses) )))) * guix/licenses.scm (define-license-predicate) (begin-license-definitions): New macros : Wrap definitions in 'begin-license-definitions'. --- guix/licenses.scm | 58 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/guix/licenses.scm b/guix/licenses.scm index 3b820ae07e..80cf0f1114 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2014, 2015, 2017, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2014, 2015, 2017, 2019, 2020, 2022 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2015 Mark H Weaver @@ -109,13 +109,6 @@ (define-module (guix licenses) hpnd fsdg-compatible)) -(define-record-type - (license name uri comment) - license? - (name license-name) - (uri license-uri) - (comment license-comment)) - ;;; Commentary: ;;; ;;; Available licenses. @@ -129,6 +122,53 @@ (define-record-type ;;; ;;; Code: +(define-record-type + (license name uri comment) + actual-license? + (name license-name) + (uri license-uri) + (comment license-comment)) + +(define-syntax define-license-predicate + (syntax-rules (define define*) + "Define PREDICATE as a license predicate that, when applied to trivial +cases, reduces to #t at macro-expansion time." + ((_ predicate (variables ...) (procedures ...) + (define variable _) rest ...) + (define-license-predicate + predicate + (variable variables ...) (procedures ...) + rest ...)) + ((_ predicate (variables ...) (procedures ...) + (define* (procedure _ ...) _ ...) + rest ...) + (define-license-predicate + predicate + (variables ...) (procedure procedures ...) + rest ...)) + ((_ predicate (variables ...) (procedures ...)) + (define-syntax predicate + (lambda (s) + (syntax-case s (variables ... procedures ...) + ((_ variables) #t) ... + ((_ (procedures _)) #t) ... + ((_ obj) #'(actual-license? obj)) + (id + (identifier? #'id) + #'actual-license?))))))) + +(define-syntax begin-license-definitions + (syntax-rules () + ((_ predicate definitions ...) + (begin + ;; Define PREDICATE such that it expands to #t when passed one of the + ;; identifiers in DEFINITIONS. + (define-license-predicate predicate () () definitions ...) + + definitions ...)))) + +(begin-license-definitions license? + (define agpl1 (license "AGPL 1" "https://gnu.org/licenses/agpl.html" @@ -717,6 +757,6 @@ (define* (fsdg-compatible uri #:optional (comment "")) https://www.gnu.org/distros/free-system-distribution-guidelines.en.html#non-functional-data." (license "FSDG-compatible" uri - comment)) + comment))) ;;; licenses.scm ends here