From ihatchondo at common-lisp.net Wed Aug 11 21:49:29 2010 From: ihatchondo at common-lisp.net (ihatchondo) Date: Wed, 11 Aug 2010 17:49:29 -0400 Subject: [cldoc-cvs] CVS cldoc/src Message-ID: Update of /project/cldoc/cvsroot/cldoc/src In directory cl-net:/tmp/cvs-serv11610/src Modified Files: cludg.lisp Log Message: Fix: class slot and method qualifier handling from Joshua TAYLOR. --- /project/cldoc/cvsroot/cldoc/src/cludg.lisp 2007/01/11 00:05:06 1.8 +++ /project/cldoc/cvsroot/cldoc/src/cludg.lisp 2010/08/11 21:49:29 1.9 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CLUDG; -*- -;;; $Id: cludg.lisp,v 1.8 2007/01/11 00:05:06 ihatchondo Exp $ +;;; $Id: cludg.lisp,v 1.9 2010/08/11 21:49:29 ihatchondo Exp $ ;;; --------------------------------------------------------------------------- ;;; Title: Common Lisp Universal Documentation Generator ;;; Created: 2005 10 23 12:30 @@ -248,7 +248,7 @@ ;;; Pathname manipulation. (defun add-prefix-if-necessary (prefix filenames) - "Adds the specified prefix to eaxh filename when necessary." + "Adds the specified prefix to each filename when necessary." (loop for file in filenames if (probe-file (merge-pathnames file prefix)) collect (namestring (merge-pathnames file prefix)) @@ -781,10 +781,10 @@ (defun find-qualifiers-and-lambda-list (forms) "Returns the list of qualifiers if any and the arguments lambda-list." - (loop for form in forms - if (keywordp form) collect form into qualifiers - else do (loop-finish) - finally (return (values qualifiers form)))) + (do ((qualifiers '() (list* (first forms) qualifiers)) + (forms forms (rest forms))) + ((listp (first forms)) + (values (nreverse qualifiers) (first forms))))) (defun handle-slots (class-name slots) "Returns a list of slot-descriptor object that represent the @@ -815,7 +815,7 @@ when (eq key :initarg) collect value into initargs end finally (return (list readers writers accessors initargs)))) (listify (a) (if (listp a) a (list a)))) - (loop for slot in slots + (loop for slot in (mapcar #'listify slots) for options = (cdr slot) for (readers writers accessors initargs) = (get-repeated options) collect