summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-06-25 16:31:33 +0200
committerLudovic Courtès <ludo@gnu.org>2018-12-19 23:52:24 +0100
commit0b1be8fd57233c11e3b8ad71bd20af9349539cbd (patch)
tree3bcc1401f653997a2259e38dc5551000b5954be1
parentb334674fe5e99209e4f726e0d692ffa6bab9d6a1 (diff)
packages: Turn 'cache!' into a single-value-return cache.
* guix/packages.scm (cache!): Assume THUNK returns a single value. (cached): Likewise.
-rw-r--r--guix/packages.scm12
1 files changed, 5 insertions, 7 deletions
diff --git a/guix/packages.scm b/guix/packages.scm
index eab0b3404c..e4c2ac3be5 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -870,14 +870,14 @@ OVERRIDES."
SYSTEM."
;; FIXME: This memoization should be associated with the open store, because
;; otherwise it breaks when switching to a different store.
- (let ((vals (call-with-values thunk list)))
+ (let ((result (thunk)))
;; Use `hashq-set!' instead of `hash-set!' because `hash' returns the
;; same value for all structs (as of Guile 2.0.6), and because pointer
;; equality is sufficient in practice.
(hashq-set! cache package
- `((,system ,@vals)
+ `((,system . ,result)
,@(or (hashq-ref cache package) '())))
- (apply values vals)))
+ result))
(define-syntax cached
(syntax-rules (=>)
@@ -889,10 +889,8 @@ Return the cached result when available."
(match (hashq-ref cache package)
((alist (... ...))
(match (assoc-ref alist key)
- ((vals (... ...))
- (apply values vals))
- (#f
- (cache! cache package key thunk))))
+ (#f (cache! cache package key thunk))
+ (value value)))
(#f
(cache! cache package key thunk)))))
((_ package system body ...)