From a21b062e12e1133b5ac2faa978c08ce840ef5e02 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 19 Mar 2021 10:47:43 -0700 Subject: pull MAKE-PROPSPEC out of PROPS & set SYSTEMS from *HOST* We want a property application specification expression to be what goes into DEFPROPSPEC because then we can set the systems slot based on the host to which the property is applied, rather than looking at *CONSFIG*. Signed-off-by: Sean Whitton --- src/propspec.lisp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/propspec.lisp') diff --git a/src/propspec.lisp b/src/propspec.lisp index 13204d9..0c395dd 100644 --- a/src/propspec.lisp +++ b/src/propspec.lisp @@ -250,17 +250,16 @@ processed." (defmacro props (combinator &rest forms) "Apply variadic COMBINATOR to FORMS and convert from an unevaluated property -application specification expression to a property application specification." +application specification expression to a property application specification +expression." (flet ((evaluate (propapp) `(list ',(car propapp) ,@(cdr propapp)))) - (let ((propspec - (handler-case - (map-propspec-propapps #'evaluate (cons combinator forms) t) - (ambiguous-propspec (c) - ;; resignal with a more specific error message - (error 'ambiguous-unevaluated-propspec - :name (cell-error-name c)))))) - `(make-propspec :propspec ,propspec)))) + (handler-case + (map-propspec-propapps #'evaluate (cons combinator forms) t) + (ambiguous-propspec (c) + ;; resignal with a more specific error message + (error 'ambiguous-unevaluated-propspec + :name (cell-error-name c)))))) ;;;; Property combinators -- cgit v1.2.3