From db650186699ec82de2cfc9c2cbed1816b231cfec Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 13 Mar 2021 14:01:38 -0700 Subject: attempt to implement revised propspecs spec Signed-off-by: Sean Whitton --- src/host.lisp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/host.lisp') diff --git a/src/host.lisp b/src/host.lisp index db028a7..88b26c5 100644 --- a/src/host.lisp +++ b/src/host.lisp @@ -47,10 +47,8 @@ be applied to the host."))) (defmethod %eval-propspec-hostattrs ((host host) (propspec propspec)) "Modify HOST in-place according to :HOSTATTRS subroutines." - (loop with *host* = host - for form in (propspec-props propspec) - for propapp = (compile-propapp form) - do (propappattrs propapp))) + (let ((*host* host)) + (propappattrs (eval-propspec propspec)))) ;; return values of the following two functions share structure, and thus are ;; not safe to use except on host objects that were just made, or that are @@ -107,7 +105,7 @@ entries." (declaim (type host ,hostname-sym)) (defparameter ,hostname-sym (%replace-propspec-into-host (make-instance 'host :attrs ',attrs) - ,(props properties)) + (props seqprops ,@properties)) ,(car (getf attrs :desc))) ,@(and deploy `((defdeploy ,hostname-sym (,deploy ,hostname-sym))))))) -- cgit v1.2.3