aboutsummaryrefslogtreecommitdiff
path: root/src/data.lisp
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-09-05 15:38:46 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-09-08 13:09:37 -0700
commit210a2d70570792f8fac53960557232de910bff37 (patch)
tree4060cbe2298a02426b2df7c31507512c948a6c1e /src/data.lisp
parenta41a42f86145909bafa1d7ce75a2ca3a9944e7fa (diff)
downloadconsfigurator-210a2d70570792f8fac53960557232de910bff37.tar.gz
add dep on Anaphora and use APROG1, ALET & AAND in various places
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/data.lisp')
-rw-r--r--src/data.lisp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/data.lisp b/src/data.lisp
index fa814f0..d87e648 100644
--- a/src/data.lisp
+++ b/src/data.lisp
@@ -201,10 +201,9 @@ This function is called by property :APPLY and :UNAPPLY subroutines."
(informat 3 "~&Obtaining ~S | ~S from a data source" iden1 iden2)
(values
(lambda ()
- (let ((from-source-data (funcall (cdr from-source))))
- (when (subtypep (type-of from-source-data) 'string-data)
- (setf (gethash idenpair *string-data*) from-source-data))
- from-source-data))
+ (aprog1 (funcall (cdr from-source))
+ (when (subtypep (type-of it) 'string-data)
+ (setf (gethash idenpair *string-data*) it))))
from-source-version))
((and local-cached
(or (not from-source) (version>= local-cached-version