src/utilities.lisp (compose): Handle the case of zero arguments.

[sod] / src / optparse.lisp

diff --git a/src/optparse.lisp b/src/optparse.lisp
index 6460c54ae0b27cc777796ee127a71fc797a52e19..5268cda728f33c69f7c8c7e65c7acbdeaaa059b0 100644 (file)
--- a/src/optparse.lisp
+++ b/src/optparse.lisp
@@ -85,7 +85,7 @@ (defun set-command-line-arguments ()
                                                  collect (ext:argv i))))
                               (error "Unsupported Lisp"))))))
 
                                                  collect (ext:argv i))))
                               (error "Unsupported Lisp"))))))
 

-         *program-name* (pathname-name (car *command-line*))))
+       *program-name* (pathname-name (car *command-line*))))

 
 ;;;--------------------------------------------------------------------------
 ;;; Fancy conditionals.
 
 ;;;--------------------------------------------------------------------------
 ;;; Fancy conditionals.


@@ -165,7 +165,7 @@ (defstruct (option
                          (opt-long-name o)
                          (opt-arg-optional-p o)
                          (opt-arg-name o)
                          (opt-long-name o)
                          (opt-arg-optional-p o)
                          (opt-arg-name o)

-                         (opt-documentation o)))))
+                         (opt-%documentation o)))))

             (:constructor %make-option
                 (&key long-name tag negated-tag short-name
                       arg-name arg-optional-p documentation
             (:constructor %make-option
                 (&key long-name tag negated-tag short-name
                       arg-name arg-optional-p documentation


@@ -207,7 +207,7 @@ (defstruct (option
                wrapped.  If nil, the option is omitted from the help
                text.
 
                wrapped.  If nil, the option is omitted from the help
                text.
 

-   Usually, one won't use make-option, but use the option macro instead."
+   Usually, one won't use `make-option', but use the `option' macro instead."

   (long-name nil :type (or null string))
   (tag nil :type t)
   (negated-tag nil :type t)
   (long-name nil :type (or null string))
   (tag nil :type t)
   (negated-tag nil :type t)


@@ -896,11 +896,8 @@ (defmacro options (&rest optlist)
 ;;; Support stuff for help and usage messages.
 
 (defun print-text (string
 ;;; Support stuff for help and usage messages.
 
 (defun print-text (string

-                  &optional
-                  (stream *standard-output*)
-                  &key
-                  (start 0)
-                  (end nil))
+                  &optional (stream *standard-output*)
+                  &key (start 0) (end nil))

   "Prints STRING to a pretty-printed STREAM, breaking it at whitespace and
    newlines in the obvious way.  Stuff between square brackets is not broken:
    this makes usage messages work better."
   "Prints STRING to a pretty-printed STREAM, breaking it at whitespace and
    newlines in the obvious way.  Stuff between square brackets is not broken:
    this makes usage messages work better."