From c2430567f4982fa55b53341cd2d7552671935a5c Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 3 May 2021 15:44:37 -0700 Subject: add & use PROPAPP macro Signed-off-by: Sean Whitton --- src/propspec.lisp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/propspec.lisp') diff --git a/src/propspec.lisp b/src/propspec.lisp index 16df661..525429b 100644 --- a/src/propspec.lisp +++ b/src/propspec.lisp @@ -243,15 +243,18 @@ unevaluated propspec are defined before that unevaluated propspec is processed." (cell-error-name condition))))) -(defmacro props (combinator &rest forms) - "Apply variadic COMBINATOR to FORMS and convert from an unevaluated property -application specification expression to a property application specification -expression." +(defmacro propapp (form) + "Convert a single element of an unevaluated property application specification +expression to a property application specification expression." (flet ((evaluate (propapp) `(list ',(car propapp) ,@(cdr propapp)))) - (handler-case - (map-propspec-propapps #'evaluate (cons combinator forms) t) + (handler-case (map-propspec-propapps #'evaluate form t) (ambiguous-propspec (c) ;; resignal with a more specific error message - (error 'ambiguous-unevaluated-propspec - :name (cell-error-name c)))))) + (error 'ambiguous-unevaluated-propspec :name (cell-error-name c)))))) + +(defmacro props (combinator &rest forms) + "Apply variadic COMBINATOR to FORMS and convert from an unevaluated property +application specification expression to a property application specification +expression." + `(propapp ,(cons combinator forms))) -- cgit v1.2.3