Browse Source

gexp: Support 'ungexp' forms in improper lists.

* guix/gexp.scm (gexp)[collect-escapes, substitute-references]: Replace
the (exp0 exp ...) patterns with (exp0 . exp) to match improper lists.
Adjust clause bodies accordingly.
* tests/gexp.scm ("one input package, dotted list"): New test.
wip-gexp-grafts
Ludovic Courtès 5 years ago
parent
commit
5e2e4a51f9
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 8
      guix/gexp.scm
  2. 12
      tests/gexp.scm

8
guix/gexp.scm

@ -812,9 +812,9 @@ environment."
(cons exp result))
((ungexp-native-splicing _ ...)
(cons exp result))
((exp0 exp ...)
((exp0 . exp)
(let ((result (loop #'exp0 result)))
(fold loop result #'(exp ...))))
(loop #'exp result)))
(_
result))))
@ -875,9 +875,9 @@ environment."
(substitute-ungexp-splicing exp substs))
(((ungexp-native-splicing _ ...) rest ...)
(substitute-ungexp-splicing exp substs))
((exp0 exp ...)
((exp0 . exp)
#`(cons #,(substitute-references #'exp0 substs)
#,(substitute-references #'(exp ...) substs)))
#,(substitute-references #'exp substs)))
(x #''x)))
(syntax-case s (ungexp output)

12
tests/gexp.scm

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -92,6 +92,16 @@
(package-derivation %store coreutils)))
(gexp->sexp* exp)))))
(test-assert "one input package, dotted list"
(let ((exp (gexp (coreutils . (ungexp coreutils)))))
(and (gexp? exp)
(match (gexp-inputs exp)
(((p "out"))
(eq? p coreutils)))
(equal? `(coreutils . ,(derivation->output-path
(package-derivation %store coreutils)))
(gexp->sexp* exp)))))
(test-assert "one input origin"
(let ((exp (gexp (display (ungexp (package-source coreutils))))))
(and (gexp? exp)

Loading…
Cancel
Save