[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Revert merge conflict resolution in "DRAFT gexp".
From: |
David Craven |
Subject: |
01/01: Revert merge conflict resolution in "DRAFT gexp". |
Date: |
Fri, 6 Jan 2017 11:35:44 +0000 (UTC) |
dvc pushed a commit to branch wip-build-systems-gexp
in repository guix.
commit b948cfac701ab46ff204f71f431d352ff3c048d6
Author: David Craven <address@hidden>
Date: Fri Jan 6 12:24:00 2017 +0100
Revert merge conflict resolution in "DRAFT gexp".
Fixes failing tests.
This reverts commit 58fee7f55cfa0b489c3fd7de7e375faa13ab4efb.
---
guix/gexp.scm | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/guix/gexp.scm b/guix/gexp.scm
index b689884..1a4d260 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -725,7 +725,12 @@ references; otherwise, return only non-native references."
(($ <gexp-input> (? gexp? exp))
(append (gexp-outputs exp) result))
(($ <gexp-input> (lst ...) output native?)
- (add-reference-output lst result))
+ ;; XXX: Automatically convert LST.
+ (add-reference-output (map (match-lambda
+ ((? gexp-input? x) x)
+ (x (%gexp-input x "out" native?)))
+ lst)
+ result))
((lst ...)
(fold-right add-reference-output result lst))
(_
@@ -842,8 +847,8 @@ instance, it could be a gexp), return it."
(define (escape->ref exp)
;; Turn 'ungexp' form EXP into a "reference".
(syntax-case exp (ungexp ungexp-splicing
- ungexp-native ungexp-native-splicing
- output)
+ ungexp-native ungexp-native-splicing
+ output)
((ungexp output)
#'(gexp-output "out"))
((ungexp output name)
@@ -889,7 +894,7 @@ instance, it could be a gexp), return it."
;; Return a variant of EXP where all the cars of SUBSTS have been
;; replaced by the corresponding cdr.
(syntax-case exp (ungexp ungexp-native
- ungexp-splicing ungexp-native-splicing)
+ ungexp-splicing ungexp-native-splicing)
((ungexp _ ...)
(substitute-ungexp exp substs))
((ungexp-native _ ...)