diff options
| -rw-r--r-- | src/property.lisp | 4 | ||||
| -rw-r--r-- | src/util.lisp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/property.lisp b/src/property.lisp index d94a534..f0a89a7 100644 --- a/src/property.lisp +++ b/src/property.lisp @@ -235,7 +235,9 @@ parsing FORMSV and pushing SETPROP keyword argument pairs to plist SLOTSV." (when (> (length ,declarations) 1) (error "Multiple DECLARE forms unsupported.")) ,@mforms - (let ((indent (cadr (assoc 'indent (cdar ,declarations))))) + (let ((indent (cadr (find-if (lambda (e) + (form-beginning-with indent e)) + (cdar ,declarations))))) `(progn (eval-when (:compile-toplevel :load-toplevel :execute) (record-known-property ',,name)) diff --git a/src/util.lisp b/src/util.lisp index 7ee7e1a..f07e90e 100644 --- a/src/util.lisp +++ b/src/util.lisp @@ -116,7 +116,9 @@ supported." (error ',name :format-control message :format-arguments args)))) (defmacro form-beginning-with (sym form) - `(and (listp ,form) (eq ',sym (car ,form)))) + `(and (listp ,form) + (symbolp (car ,form)) + (string= (symbol-name (car ,form)) ,(symbol-name sym)))) (defun strip-declarations (forms) (loop while (form-beginning-with declare (car forms)) |