X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/a035dd4a8175317f19a35cd04568d1655fb8d417..f94dcd9764b69dbd80d5d4f2083bfb5bf731b425:/optparse.lisp

diff --git a/optparse.lisp b/optparse.lisp
index 5f28365..8a8fc43 100644
--- a/optparse.lisp
+++ b/optparse.lisp
@@ -13,12 +13,12 @@
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 2 of the License, or
 ;;; (at your option) any later version.
-;;; 
+;;;
 ;;; This program is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;; GNU General Public License for more details.
-;;; 
+;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software Foundation,
 ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -105,7 +105,7 @@
 
    NEGATED-TAG  As for TAG, but used if the negated form of the option is
 		found.  If this is nil (the default), the option cannot be
-		negated. 
+		negated.
 
    SHORT-NAME   The option's short name.  This must be a single character, or
 		nil if the option has no short name.
@@ -446,13 +446,15 @@ Ambiguous long option `~A' -- could be any of:~{~%  --~A~}"
    on some parameters (the ARGS) and the value of an option-argument named
    ARG."
   (let ((func (intern (format nil "OPTHANDLER/~:@(~A~)" name))))
-    `(progn
-       (setf (get ',name 'opthandler) ',func)
-       (defun ,func (,var ,arg ,@args)
-	 (with-locatives ,var
-	   (declare (ignorable ,arg))
-	   ,@body))
-      ',name)))
+    (with-parsed-body (body decls docs) body
+      `(progn
+	 (setf (get ',name 'opthandler) ',func)
+	 (defun ,func (,var ,arg ,@args)
+	   ,@docs ,@decls
+	   (with-locatives ,var
+	     (declare (ignorable ,arg))
+	     ,@body))
+	 ',name))))
 
 (defun parse-c-integer (string &key radix (start 0) end)
   "Parse STRING, or at least the parts of it between START and END, according
@@ -462,7 +464,7 @@ Ambiguous long option `~A' -- could be any of:~{~%  --~A~}"
    if RADIX is nil.  Returns two values: the integer parsed (or nil if there
    wasn't enough for a sensible parse), and the index following the
    characters of the integer."
-  (unless end (setf end (length string)))
+  (setf-default end (length string))
   (labels ((simple (i r goodp sgn)
 	     (multiple-value-bind
 		 (a i)
@@ -700,7 +702,7 @@ Ambiguous long option `~A' -- could be any of:~{~%  --~A~}"
    STRING	A banner to print.
 
    SYMBOL or (SYMBOL STUFF...)
-	 	If SYMBOL is an optform macro, the result of invoking it.
+		If SYMBOL is an optform macro, the result of invoking it.
 
    (...)	A full option-form.  See below.
 
@@ -771,8 +773,7 @@ Ambiguous long option `~A' -- could be any of:~{~%  --~A~}"
     (flet ((emit ()
 	     (write-string string stream :start start :end i)
 	     (setf start i)))
-      (unless end
-	(setf end (length string)))
+      (setf-default end (length string))
       (loop
 	 (unless (< i end)
 	   (emit)