[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/10: gexp: Rename <output-ref> to <gexp-output>.
From: |
Ludovic Courtès |
Subject: |
02/10: gexp: Rename <output-ref> to <gexp-output>. |
Date: |
Tue, 17 Mar 2015 21:28:57 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 1e87da58a160d75ba3f5356809a715c04ae31697
Author: Ludovic Courtès <address@hidden>
Date: Mon Mar 16 22:31:14 2015 +0100
gexp: Rename <output-ref> to <gexp-output>.
* guix/gexp.scm (<output-ref>): Rename to...
(<gexp-output>): ... this. Adjust constructor/accessor names and
users accordingly.
---
guix/gexp.scm | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 1e26342..67329b7 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -81,10 +81,10 @@
;; Reference to one of the derivation's outputs, for gexps used in
;; derivations.
-(define-record-type <output-ref>
- (output-ref name)
- output-ref?
- (name output-ref-name))
+(define-record-type <gexp-output>
+ (gexp-output name)
+ gexp-output?
+ (name gexp-output-name))
(define raw-derivation
(store-lift derivation))
@@ -310,7 +310,7 @@ references."
"Return the outputs referred to by EXP as a list of strings."
(define (add-reference-output ref result)
(match ref
- (($ <output-ref> name)
+ (($ <gexp-output> name)
(cons name result))
((? gexp? exp)
(append (gexp-outputs exp) result))
@@ -340,7 +340,7 @@ and in the current monad setting (system type, etc.)"
(((? origin? o) (? string? output))
(mlet %store-monad ((drv (origin->derivation o)))
(return (derivation->output-path drv output))))
- (($ <output-ref> output)
+ (($ <gexp-output> output)
;; Output file names are not known in advance but the daemon defines
;; an environment variable for each of them at build time, so use
;; that trick.
@@ -441,9 +441,9 @@ package/derivation references."
ungexp-native ungexp-native-splicing
output)
((ungexp output)
- #'(output-ref "out"))
+ #'(gexp-output "out"))
((ungexp output name)
- #'(output-ref name))
+ #'(gexp-output name))
((ungexp thing)
#'thing)
((ungexp drv-or-pkg out)
- branch master updated (708155d -> 5250a4f), Ludovic Courtès, 2015/03/17
- 01/10: tests: Add an indirection for white-box testing., Ludovic Courtès, 2015/03/17
- 04/10: gexp: Export 'gexp-input' constructor., Ludovic Courtès, 2015/03/17
- 05/10: profiles: Use 'gexp-input' instead of two-element lists., Ludovic Courtès, 2015/03/17
- 06/10: gexp: Remove special meaning of forms (PACKAGE OUTPUT) in ungexp., Ludovic Courtès, 2015/03/17
- 08/10: packages: Move grafting parameter to (guix derivations)., Ludovic Courtès, 2015/03/17
- 07/10: gexp: Separate "compilers" for origins and packages from the core., Ludovic Courtès, 2015/03/17
- 10/10: services: guix-service: Remove extraneous monadism., Ludovic Courtès, 2015/03/17
- 09/10: gexp: Move the package and origin compilers to (guix packages)., Ludovic Courtès, 2015/03/17
- 02/10: gexp: Rename <output-ref> to <gexp-output>.,
Ludovic Courtès <=
- 03/10: gexp: Add <gexp-input>., Ludovic Courtès, 2015/03/17